Fix a bunch of namespace errors.