Change variables names
0.7.0