Fix Generic names

Prior to this commit we hardcoded the localhostcert, this commit fixes
that