Unify variable naming scheme 0
#3 opened on 12 Nov 2015 by blr Beta