remap, fix missing idents