update package names according to Naming Conventions
update package names according to Naming Conventions