minor cleanup of method names.