Fix some naming issues, including not use Python keyword in
the code and a test function name.
Merge pull request #306 from reterVision/master

Fix some naming issues