Revert "Change variable names to match new twitter API"

This reverts commit 58fc192a105021047894ad64f9afb5823ab3275c.
Revert "Revert "Change variable names to match new twitter API""

This reverts commit 24217391162f3bea955986c99f7e3e25a8be336d.