Fixed change of namespace issues