fixing package names adapting them to new policy