Fixed quoted strings being double quoted. Fixed renamed tables to be correctly populated.