more fixes for capitalisation

replaces PR #725