Fix namespace changes in compiling