This again forces a specific variable name on the provider.

Could this be implemented as a hook or form_alter?