Added USING_ macros to types + CamelCase versions
tidy up types (removed straggling historical typedefs)