Updated scripts according to new specifications refs #15669