Standardize naming of broadcast variables