More consistent naming of private methods.