rename certificates + small refactoring