SQL renaming.

Change-Id: Id89200d9dfa7e680b280d083e9fcb9fc8d6a03ce