replace other things with names/idents, still working