Commit before leaving office

Changed few variables' names whose usage is understood.