refactor: s/C(aller)Map/T(rap)Map/g