Fix up factories for con rename