Update and rename Persona to Factory