Updated defines for each Header
Updated namespace for each Header