Rename 'package-require' to 'require-package', add TODO