Updating PACKAGE_REGEX to be a bit more flexible