Rename variables and fix link to cnbb