Stop getting hung-up on colours. Rename things properly.