refacto: renaming, specific token not found op

3 jobs for feature/split-apn-interaction-and-business-data in 12 minutes and 32 seconds