cherry-pick chore: cleanup v2 naming for sql metastore (#18941) to branch release-2.1

cherry-pick chore: cleanup v2 naming for sql metastore (#18941) to branch release-2.1 #3603