Tidy up

Renaming of some classes (Making sub-classes of OpenSSL libraries)