Modify confusing variable naming (damn search-and-replace)