fix names on relation index
Merge origin/master