rename some function and variable
Merge branch 'dev.python' into dev