(cherry picked from commit d1a053e4f5a29f96b3300397e16d3e63a1cf9bae) Rename sql (cherry picked from commit 41e776fe64e2072d165b990cc9e9d2bfdd698855)
(cherry picked from commit d1a053e4f5a29f96b3300397e16d3e63a1cf9bae) Rename sql (cherry picked from commit 41e776fe64e2072d165b990cc9e9d2bfdd698855)