Fix table names - copy pasterino