part 2 of refactoring work: cleaned up all naming issues