New names for methods and variables

Added new names for methods and variables