fixed namespaces for consistency