-replaced old namespaced by new one
-fixed compiling issues