Modified MchMetadata nested class names to avoid conflicts with core classes