Add escaping for table names

Change-Id: I3dfb4db365a6f507a9cf8884f2d149ee8a82e628