~ more package name fixes
~