Changed variable names that were abbreviations