Fixes #2681
refactoring of package names for consistency
Committing changes to definedtermeditor after merge from branch
Fixes #2383
Working on the polytomous key editor
Fixes problem that arose during review of #2004
had to rename the packages to make them compliant with buckminster