The OSX build showed these might be shadowed, renamed to avoid it.
Merge pull request #3248 from fluffyfreak/colour_shadowing

The OSX build showed these might be shadowed.