Reorganized namespace definitions.