Fixed declare names on metric mixins
Merge branch 'develop' of https://github.com/Saleslogix/argos-saleslogix into develop