[bcl] Rename variables to avoid conflict with later renames