Always prefer getter names when applicaple

Fixes the build for 2.11 and is more correct.