Tweaking some variable names and bumping the version