Added name tags
Fixed merge