Rename syntax-mapper - #3