Remove double underscore in related name