Rework namespaces based on agreement with other similar projects.