Renaming confusing variables