package name fixes?