Get rid of underscores in API

Outside the Python, underscores are ugly.