Renaming and simplifying as part of colour scheme changes