Fix some naming issues, including not use Python keyword in
the code and a test function name.