Fix errors from changing package names around