Fixed some more namespace issues
Changed settings from #define to constexpr and all caps