Adding name mapping to functions.