refactoring bad property naming for more consistency