update correction NB

- Change how receiver templates and affixes are used
- Refactor and correct data sources list from receivers to data_sources
- Apply related refactors based on last item.