Various refactorings according to given name conventions.