Improvements to entity diffing code

What maintenance are you talking about exactly? Are you saying this should not be done because then we cannot easily rename the type? I agree it makes that harder yes. Though it is already impossible, so what difference does that make?