Fixed issues related to FormAbstractFactory renaming