Renamed FiniteStates and FiniteFactoredStates to StatesMap and FactoredStatesMap, respectively.