Refactor for SSL.
Inconsistent naming.