Edits var and method names for consistency