Update color variable naming convention