Fix up the declaration and naming of the variables