[#44133333] Rename type to entitySubtype for datasets