Before revision: g and s The two-factor theory consist of g, the general intelligence has two components.
After revision: g and s Spearman proposed that his two-factor theory has two components.