rename variables in cdep.py
merge