Fix for previous + deal with the changed name convention in the ChefDK rpms.