change namespace
fix problems in build process