Implements suggested preliminary solution for #2399
had to rename the packages to make them compliant with buckminster