VE-742 Rename variables and simplify edit link replacement/removal