Switched away from named subpatterns

They break compatibility with 1.8.7, which is what the vm uses for provisioning by default