Cleanup name usage to be more explicit and clear where necessary