Reverted the private function names back to the no-underscore version.