Fix some completion bugs.
Change some member function names.