Did a few updates

Renaming and changed while loop