added renaming to CPS