Update name mapper to accommodate some new names.