Change variable/function names for clearer message