Added name mapping