Update color variable names to make sense