Fixes #1405: fixed disambiguation of relation names generated by gii.