When I scroll through the patch, I still see a lot of places where "jboss-as-${some.var}" has become "wildfly-${some.var}". The build-config and dist modules in particular; I stopped scrolling there.