Removed top level mangling in build process