Reworked some of the types and keywords to reflect my usage of C++
Authored by: andy_rushton 2011-01-19
Parent: [r433]
Child: [r435]
