Finishing up consistent API naming.