renamed some domain objects