Fix class names for XP classes in main namespaces