JBTM-1355 drop the '11' suffix in the package structure