fixing variable names

chaining variable names to make more sense with the new approach.