Adapt to package renames for grizzly and newer installs.