Rename control points to fulfill modularity test script requirements, and to improve code readability.

The modularity script requires that public macros and functions begin with the name of the module which is CP.

Some people have said the current names are too long. I want them long so they stand out allowing control point code to be ignored while reading the code. Never-the-less, renaming for the modularity script will also reduce the name lengths.