package names fixes