Create alias for variable name
Tidy up some variables' name