Some method renaming to make things clearer.