Minor member and method renaming to be consisten across the project.