Revert "Made variable names sensible"

This reverts commit 5c05b7a6175103763ce7d7427c741fd999e68fb0.