Rename color constants for consisitency