Fix underscores in namespace