A few table prefix lacunas

Change-Id: I6c757ff951de6532918d3418fd9e57b3d514391b
Merge "A few table prefix lacunas"