Fix Scaffolt Naming

A few remnants of Skaffolt in there.