Changed package names, fixed commands