More Changes in variable names