Changed the namespaces slightly. Completed (more or less) what was asked
in 2.1-4.