Shortens variable names to comply with style guides; fixes #143
Shortens variable names to comply with Spout style guides; fixes #143