Always prefer getter names when applicaple

Fixes the build for 2.11 and is more correct.
Merge pull request #60 from mads379/prefer-getter-name

Always prefer getter names when applicaple