Change variable names
0.6.0