Changed variables names to be like java style guide