Update remaining references.