Replace port-fold etc. for generator-fold etc.