modified namespaces
namespaces simplified