refactored color name conventions