This function is only applied on the fallback name, should it be applied on the export name too ?