Package name fixes