more usch->crepl renaming
clean, now add definition detection