Clean up:
Renaming to ensure consistency.. a bit OCD