Moved old color map type out of the way by renaming it.

Can now implement the new type, and then ditch the old one.