I would leave the firm's name, but distinguish each position separately, and note that you were promoted. This upward trajectory not only shows that you not only excelled in your duties, but that you could also commit to working while studying full time.