Updated some entity names in resources files