Fixed renaming strategy as seen in #1193

@Kartones , take a look. In fact renaming strategy is mostly duplicated among table_registrar.rb and table_importer.rb. I won't delete table_importer.rb in spite of being tempted to because who knows which cases does it cover, and it has not a good testing coverage right now.