fix #675
More function name rationalization

#676