fix naming issues that broke build
Merge branch 'exception'