swl None fix

renamed some variables