Backbone naming tweaks

Closes #610
Fixes #605