Can we use the ```certificateId``` here instead of the name? I'd rather use id in all cases than mix the use of id and name.