Switched from UUID (EntityID) to long-Id (and renamed *ID to *Id).