Renaming

Renaming variables and fields