Rename variables defined in CBN
Merge pull request #1375 from ke-yu/var_mapping

Rename variables defined in CBN