Renaming of several methods to make their intent clearer.