refactored def names