some cleanup and renames for the cppnow 2013 presentation