Fixing Naming issues
Coloring Fix