Migrating to refined credentials generation.