Author here - I appreciate the 2.0 version adds the concept of "container-as-a-service" and "function-as-a-service" in, as those are really the latest trends. I actually agree on Traditional on-premise deployment and IaaS. But I still find the right hand side 2.0 is not a good abstraction of X-as-a-Service. Reason: The relationship between Conversation / Friends / Beer / Pizza is not as such in SaaS /FaaS / PaaS and CaaS. They do not illustrate a correct hierarchy of customization and abstraction.

Secondly, why does beer mean "scaling"...