Corrected namespacing mismatches