Naming changed

Naming of some of the local variables, methods and classes changed.