Use variable names consistently