rename, refactor domain calcs