Small Renaming + Coloring fix