Committing changes to definedtermeditor after merge from branch
Fixes #2418
Fixes #2366
had to rename the packages to make them compliant with buckminster