Reflecting move of mappers.
[ci skip]
Renaming traits 'filling' aware interfaces
and adding getters in them