Changed some string variable names for consistency