Finally settled the color assignment thingy. Now to ensure data integrity
Naming updates