Adding name mapping