update code to make variable names match config better