[#858] cleaned up some ifdefs to not use reserved namespaces, be accurate, etc