Fixing build based on namespace