fix naming mapping