Replace domina with dommy, small cleanups