Added missing SSLCertName + some refactoring.