Change naming

Naming for variables/methods follow conventions