fixing OutOfBoundsException, #2894
Fixed #2435
had to rename the packages to make them compliant with buckminster