Some Refactoring

Changed variable names to fit our coding conventions