Renaming Things

I am trying to keep up with the PEP8 standards.