[DDC-2256] Moved aliases translation to ResultSetMapping, fixed tests.