fixed package names .. part 2