Fixes name sufix mapping