Naming again, should this follow the xxxUuid convention?