package name fixes