Renaming a poorly named variable