Finished refactoring protocol names, but a new error appeared around new session timer.