Rename some variables after overzealous Eclipse refactoring.
Rename some variables after overzealous Eclipse refactoring.

nikclayton/android-squeezer,lovethisshit/android-squeezer,stefandb/android-squeezer,kaaholst/android-squeezer