Change names, remove Domain from data structure