Minor hiera and name changes.