Rename providers to not begin with test

Duplicate of #12348 to verify jenkins test pass.