change the naming rule
use new configuration/certificate management classes instead of old ones