fix name mapping