2762 - cleanup, prepend with 'namespaced'