Fix capitalization issues

Fixes issue #1965