Fix some reference to obsoleted Factory class