Renaming SystemFactory to conform with convention.