[#4] More shepherd renamings.