Renamed infrastructure classes to make biology analogy clearer.