Renamed Calculatables

...from CalculatableFactory - as it no longer creates instances of
Caclulatable