Fixed all Var names - consistent now