update package names
update place types
optimization and update place types