Added name map for better coffeescript