more consistent names(redux)