rename some functions and variables to camelCase