Fixing broken namespace