Consistent naming for attachment type
Merge branch 'KAZOO-1208' of https://github.com/Bat-o-matic/kazoo into Bat-o-matic-KAZOO-1208
KAZOO-1208: cleanup pull request