I wouldn't change the setting name, at least not in this PR, it just makes for a lot of noise thats irrelevant to the PR itself.
I agree changing the struct/pref name should be separate, but when adding new functions to the plugin API, it's a good time to name things properly so they don't need to be changed, affecting the API later. This is the big advantage of using the accessor functions, the internal stuff they access can be renamed later if needed and nobody will notice.