Remove underscores from id templates

Templates have been names to follow convention to make maintenance easier.

## before
![same](https://cloud.githubusercontent.com/assets/31692/3116813/7d5cc104-e720-11e3-8a3e-5e999f8c61a9.png)

## after
![same](https://cloud.githubusercontent.com/assets/31692/3116813/7d5cc104-e720-11e3-8a3e-5e999f8c61a9.png)

---

![It's all in the name](http://stream1.gifsoup.com/view3/1352930/rihanna-whats-my-name-o.gif)