Refactorings and relation name correction