Added name map