Better variable names.
Merge branch 'master' of github.com:wlcsc-acsl/kittehvpenguin

Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>