Rename Critter to CritterWrapper, to distinguish it from CritterBase