Making package names consistant