(cherry picked from commit e016bf8d06c8236c160ecaf63c6a4f26f7d4467b) DB: SQL rename (cherry picked from commit 71081c2576571a6e6d5a16179e6729843094a882)
(cherry picked from commit e016bf8d06c8236c160ecaf63c6a4f26f7d4467b) DB: SQL rename (cherry picked from commit 71081c2576571a6e6d5a16179e6729843094a882)