Yes, that could definitely be more consistent. I'll be converting everything from Angular to Ember soon, so it may work best to fix that then.