REF: tweak names following code review.