More code cleaning

- use table / columns constants where they were missing

Change-Id: I3a72e88bf0c70919bd7590a9e067053cb24b5d85
1 file changed