Retain old table names