rename
d2d entity part 1