variable renames, get rid of clc dep