A little renaming to make things read better.