Change variable names more precisely