updating the variable names to be the same across all the modules