Move more package names to map