handle calculation names that overlap with existing names, closes #385
Merge github.com:modilabs/bamboo into calc-names-385