Rename variables and adjusting in cdep.py