This commit makes sure that each OverrideMetadata implementation is a top level class with a consistent name.