Fixes #2357
Fixes #2358
Removing calls of deprecated methods
had to rename the packages to make them compliant with buckminster