Fix for hard-coded domain logic names
A few small tweaks to make pre happy!