package names now made correctly