add forgotten class substitutions of rfc019 (#4877)