Renamed cloud models, removed the redundant 'Spark' prefix