Entities names & numbers changed