Package name fix part 2