standardize variable names with ID

replace fooId with fooID to be consistent with other areas
of the code.