refactoring of package names for consistency
Fixes #2358
had to rename the packages to make them compliant with buckminster