fix: Relations order, names, and promarity