added fix for package names
fixed merge