Cosmetic Name Changed

Changed names in functions for better usage