Numbering headers to no longer use namespacing suffix

Hi Rich,

If you would, please merge this to master when you have a chance so we can generate header IDs without the namespace suffix. 

Thanks