fix wrong package names
Merge branch 'master' into ninjaframework