Fixing table names