Cleaning
Make naming consistent with conventions