Moved "Original Name" field to subclass (#5133)