Add name attribute

[PivotalTracker](https://www.pivotaltracker.com/story/show/51227181)