aboood40091 Rename a few variables