rename methods and consts to not include the previous specific scenario/usecase names.