consistent package names