Clean up names to coorespond with naming convention