added name mapping