Renaming to make tests friendlier with fpcomplete.