adjusted variable names to conform with convention