Remove number from package name to be ST3 compatible
Respect package name order
Merge pull request #3021 from iltempo/master

Remove number from package name to be ST3 compatible