Apply tableName fix