Modified variables and method names to fit standards