Moved "Original Name" field to subclass (#5133)
refactoring of package names for consistency
Committing changes to definedtermeditor after merge from branch
had to rename the packages to make them compliant with buckminster