Cleanup|Map Renderer: Minor rename refactorings for consistency