Simplify variable naming

Fix #20