Removed references to previous namespace-naming