Better naming and domain updating