Rename of namespace and few types