rename scope(s) and remove invalid comments