Moved and fixed name coloring