Switch to fully qualified table names

Change-Id: If4d99d62f9ba89a560ad39af29a1b8ec19180b72