CMS-2374 Clean up last bits of qualified name