refactor: shorten relation names, cleanup a bunch