Fixed cert name lookup