Bug fix of table names