Fix URLs
Change repealed / removed nomenclature