Made some method name changes.