Fix for #1835: Allow giving a custom name to keywords implemented using ...

...the static and the hybrid APIs
Nitpicking: Newline missing from the end of the file here and in some other places. We have (unfortunately undocumented) convention to end files with a new line and thus it would be good to have then also here. In some places existing newlines were removed which also messes up the PR unnecessarily.

The easiest way to avoid missing newlines at the end if configuring editors to add them automatically.