A few adjustments regarding name and link updating