refactored to use common naming