[#4] More shepherd renaming.