fix domain renames, RT#7083