Renaming cleanup

Majority of the changes already described in an email.

Note: you'll probably have to edit the CMakeLists.txt files to get things working with Qt5.2. There is, no doubt, a way to make this easy/automatic, but I can't currently test against 5.2