Fix rename; fix qoute backlinking