rename correctly