Merge fix

Changed package names