diff --git a/matlab/cherrypick.m b/matlab/cherrypick.m
index 83dec428a..a1b97b560 100644
--- a/matlab/cherrypick.m
+++ b/matlab/cherrypick.m
@@ -245,9 +245,9 @@ function printlistofvariables(fid, kind, list, DynareModel, vappend)
             else
                 if isequal(kind, 'endo') &&  (isequal(list{i}(1:3), 'PE_') || isequal(list{i}(1:3), 'VE_'))
                     if isequal(list{i}(1:3), 'PE_')
-                        tags = sprintf('(expectation=''%s'')', 'pac');
+                        tags = sprintf('(expectation_kind=''%s'')', 'pac');
                     else
-                        tags = sprintf('(expectation=''%s'')', 'var');
+                        tags = sprintf('(expectation_kind=''%s'')', 'var');
                     end
                 else
                     error('Unknown variable.')
diff --git a/preprocessor b/preprocessor
index fbc42b193..358c3d671 160000
--- a/preprocessor
+++ b/preprocessor
@@ -1 +1 @@
-Subproject commit fbc42b19301e918ccad0955b67ae814f4db9b70b
+Subproject commit 358c3d6716e10f9fbf26c459d3e60622ae8986ab