diff --git a/build-common/test/org/jetbrains/kotlin/serialization/DebugProtoBuf.java b/build-common/test/org/jetbrains/kotlin/serialization/DebugProtoBuf.java
index ba209bbb636..4ece1f1c2fb 100644
--- a/build-common/test/org/jetbrains/kotlin/serialization/DebugProtoBuf.java
+++ b/build-common/test/org/jetbrains/kotlin/serialization/DebugProtoBuf.java
@@ -9743,7 +9743,7 @@ public final class DebugProtoBuf {
      *ClassKind
      *isInner
      *isData
-     *isHeader
+     *isExpect
      * </pre>
      */
     boolean hasFlags();
@@ -9757,7 +9757,7 @@ public final class DebugProtoBuf {
      *ClassKind
      *isInner
      *isData
-     *isHeader
+     *isExpect
      * </pre>
      */
     int getFlags();
@@ -10465,7 +10465,7 @@ public final class DebugProtoBuf {
      *ClassKind
      *isInner
      *isData
-     *isHeader
+     *isExpect
      * </pre>
      */
     public boolean hasFlags() {
@@ -10481,7 +10481,7 @@ public final class DebugProtoBuf {
      *ClassKind
      *isInner
      *isData
-     *isHeader
+     *isExpect
      * </pre>
      */
     public int getFlags() {
@@ -11826,7 +11826,7 @@ public final class DebugProtoBuf {
        *ClassKind
        *isInner
        *isData
-       *isHeader
+       *isExpect
        * </pre>
        */
       public boolean hasFlags() {
@@ -11842,7 +11842,7 @@ public final class DebugProtoBuf {
        *ClassKind
        *isInner
        *isData
-       *isHeader
+       *isExpect
        * </pre>
        */
       public int getFlags() {
@@ -11858,7 +11858,7 @@ public final class DebugProtoBuf {
        *ClassKind
        *isInner
        *isData
-       *isHeader
+       *isExpect
        * </pre>
        */
       public Builder setFlags(int value) {
@@ -11877,7 +11877,7 @@ public final class DebugProtoBuf {
        *ClassKind
        *isInner
        *isData
-       *isHeader
+       *isExpect
        * </pre>
        */
       public Builder clearFlags() {
@@ -17734,7 +17734,7 @@ public final class DebugProtoBuf {
      *isTailrec
      *isExternal
      *isSuspend
-     *isHeader
+     *isExpect
      * </pre>
      */
     boolean hasFlags();
@@ -17752,7 +17752,7 @@ public final class DebugProtoBuf {
      *isTailrec
      *isExternal
      *isSuspend
-     *isHeader
+     *isExpect
      * </pre>
      */
     int getFlags();
@@ -18097,7 +18097,7 @@ public final class DebugProtoBuf {
      *isTailrec
      *isExternal
      *isSuspend
-     *isHeader
+     *isExpect
      * </pre>
      */
     public boolean hasFlags() {
@@ -18117,7 +18117,7 @@ public final class DebugProtoBuf {
      *isTailrec
      *isExternal
      *isSuspend
-     *isHeader
+     *isExpect
      * </pre>
      */
     public int getFlags() {
@@ -18930,7 +18930,7 @@ public final class DebugProtoBuf {
        *isTailrec
        *isExternal
        *isSuspend
-       *isHeader
+       *isExpect
        * </pre>
        */
       public boolean hasFlags() {
@@ -18950,7 +18950,7 @@ public final class DebugProtoBuf {
        *isTailrec
        *isExternal
        *isSuspend
-       *isHeader
+       *isExpect
        * </pre>
        */
       public int getFlags() {
@@ -18970,7 +18970,7 @@ public final class DebugProtoBuf {
        *isTailrec
        *isExternal
        *isSuspend
-       *isHeader
+       *isExpect
        * </pre>
        */
       public Builder setFlags(int value) {
@@ -18993,7 +18993,7 @@ public final class DebugProtoBuf {
        *isTailrec
        *isExternal
        *isSuspend
-       *isHeader
+       *isExpect
        * </pre>
        */
       public Builder clearFlags() {
@@ -20039,7 +20039,7 @@ public final class DebugProtoBuf {
      *hasConstant
      *isExternal
      *isDelegated
-     *isHeader
+     *isExpect
      * </pre>
      */
     boolean hasFlags();
@@ -20059,7 +20059,7 @@ public final class DebugProtoBuf {
      *hasConstant
      *isExternal
      *isDelegated
-     *isHeader
+     *isExpect
      * </pre>
      */
     int getFlags();
@@ -20417,7 +20417,7 @@ public final class DebugProtoBuf {
      *hasConstant
      *isExternal
      *isDelegated
-     *isHeader
+     *isExpect
      * </pre>
      */
     public boolean hasFlags() {
@@ -20439,7 +20439,7 @@ public final class DebugProtoBuf {
      *hasConstant
      *isExternal
      *isDelegated
-     *isHeader
+     *isExpect
      * </pre>
      */
     public int getFlags() {
@@ -21239,7 +21239,7 @@ public final class DebugProtoBuf {
        *hasConstant
        *isExternal
        *isDelegated
-       *isHeader
+       *isExpect
        * </pre>
        */
       public boolean hasFlags() {
@@ -21261,7 +21261,7 @@ public final class DebugProtoBuf {
        *hasConstant
        *isExternal
        *isDelegated
-       *isHeader
+       *isExpect
        * </pre>
        */
       public int getFlags() {
@@ -21283,7 +21283,7 @@ public final class DebugProtoBuf {
        *hasConstant
        *isExternal
        *isDelegated
-       *isHeader
+       *isExpect
        * </pre>
        */
       public Builder setFlags(int value) {
@@ -21308,7 +21308,7 @@ public final class DebugProtoBuf {
        *hasConstant
        *isExternal
        *isDelegated
-       *isHeader
+       *isExpect
        * </pre>
        */
       public Builder clearFlags() {
diff --git a/core/deserialization/src/descriptors.proto b/core/deserialization/src/descriptors.proto
index 9ed76a06f91..cff1e9b5e64 100644
--- a/core/deserialization/src/descriptors.proto
+++ b/core/deserialization/src/descriptors.proto
@@ -185,7 +185,7 @@ message Class {
     ClassKind
     isInner
     isData
-    isHeader
+    isExpect
   */
   optional int32 flags = 1 [default = 6 /* public final class, no annotations */];
 
@@ -267,7 +267,7 @@ message Function {
     isTailrec
     isExternal
     isSuspend
-    isHeader
+    isExpect
   */
   optional int32 flags = 9 [default = 6 /* public final function, no annotations */];
   optional int32 old_flags = 1 [default = 6];
@@ -306,7 +306,7 @@ message Property {
     hasConstant
     isExternal
     isDelegated
-    isHeader
+    isExpect
   */
   optional int32 flags = 11 [default = 518 /* public (6) final property with getter (512) */];
   optional int32 old_flags = 1 [default = 2054];
diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java b/core/deserialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java
index 404340830a1..b4542e08119 100644
--- a/core/deserialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java
+++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/ProtoBuf.java
@@ -7936,7 +7936,7 @@ public final class ProtoBuf {
      *ClassKind
      *isInner
      *isData
-     *isHeader
+     *isExpect
      * </pre>
      */
     boolean hasFlags();
@@ -7950,7 +7950,7 @@ public final class ProtoBuf {
      *ClassKind
      *isInner
      *isData
-     *isHeader
+     *isExpect
      * </pre>
      */
     int getFlags();
@@ -8546,7 +8546,7 @@ public final class ProtoBuf {
      *ClassKind
      *isInner
      *isData
-     *isHeader
+     *isExpect
      * </pre>
      */
     public boolean hasFlags() {
@@ -8562,7 +8562,7 @@ public final class ProtoBuf {
      *ClassKind
      *isInner
      *isData
-     *isHeader
+     *isExpect
      * </pre>
      */
     public int getFlags() {
@@ -9663,7 +9663,7 @@ public final class ProtoBuf {
        *ClassKind
        *isInner
        *isData
-       *isHeader
+       *isExpect
        * </pre>
        */
       public boolean hasFlags() {
@@ -9679,7 +9679,7 @@ public final class ProtoBuf {
        *ClassKind
        *isInner
        *isData
-       *isHeader
+       *isExpect
        * </pre>
        */
       public int getFlags() {
@@ -9695,7 +9695,7 @@ public final class ProtoBuf {
        *ClassKind
        *isInner
        *isData
-       *isHeader
+       *isExpect
        * </pre>
        */
       public Builder setFlags(int value) {
@@ -9714,7 +9714,7 @@ public final class ProtoBuf {
        *ClassKind
        *isInner
        *isData
-       *isHeader
+       *isExpect
        * </pre>
        */
       public Builder clearFlags() {
@@ -13615,7 +13615,7 @@ public final class ProtoBuf {
      *isTailrec
      *isExternal
      *isSuspend
-     *isHeader
+     *isExpect
      * </pre>
      */
     boolean hasFlags();
@@ -13633,7 +13633,7 @@ public final class ProtoBuf {
      *isTailrec
      *isExternal
      *isSuspend
-     *isHeader
+     *isExpect
      * </pre>
      */
     int getFlags();
@@ -13938,7 +13938,7 @@ public final class ProtoBuf {
      *isTailrec
      *isExternal
      *isSuspend
-     *isHeader
+     *isExpect
      * </pre>
      */
     public boolean hasFlags() {
@@ -13958,7 +13958,7 @@ public final class ProtoBuf {
      *isTailrec
      *isExternal
      *isSuspend
-     *isHeader
+     *isExpect
      * </pre>
      */
     public int getFlags() {
@@ -14637,7 +14637,7 @@ public final class ProtoBuf {
        *isTailrec
        *isExternal
        *isSuspend
-       *isHeader
+       *isExpect
        * </pre>
        */
       public boolean hasFlags() {
@@ -14657,7 +14657,7 @@ public final class ProtoBuf {
        *isTailrec
        *isExternal
        *isSuspend
-       *isHeader
+       *isExpect
        * </pre>
        */
       public int getFlags() {
@@ -14677,7 +14677,7 @@ public final class ProtoBuf {
        *isTailrec
        *isExternal
        *isSuspend
-       *isHeader
+       *isExpect
        * </pre>
        */
       public Builder setFlags(int value) {
@@ -14700,7 +14700,7 @@ public final class ProtoBuf {
        *isTailrec
        *isExternal
        *isSuspend
-       *isHeader
+       *isExpect
        * </pre>
        */
       public Builder clearFlags() {
@@ -15348,7 +15348,7 @@ public final class ProtoBuf {
      *hasConstant
      *isExternal
      *isDelegated
-     *isHeader
+     *isExpect
      * </pre>
      */
     boolean hasFlags();
@@ -15368,7 +15368,7 @@ public final class ProtoBuf {
      *hasConstant
      *isExternal
      *isDelegated
-     *isHeader
+     *isExpect
      * </pre>
      */
     int getFlags();
@@ -15696,7 +15696,7 @@ public final class ProtoBuf {
      *hasConstant
      *isExternal
      *isDelegated
-     *isHeader
+     *isExpect
      * </pre>
      */
     public boolean hasFlags() {
@@ -15718,7 +15718,7 @@ public final class ProtoBuf {
      *hasConstant
      *isExternal
      *isDelegated
-     *isHeader
+     *isExpect
      * </pre>
      */
     public int getFlags() {
@@ -16409,7 +16409,7 @@ public final class ProtoBuf {
        *hasConstant
        *isExternal
        *isDelegated
-       *isHeader
+       *isExpect
        * </pre>
        */
       public boolean hasFlags() {
@@ -16431,7 +16431,7 @@ public final class ProtoBuf {
        *hasConstant
        *isExternal
        *isDelegated
-       *isHeader
+       *isExpect
        * </pre>
        */
       public int getFlags() {
@@ -16453,7 +16453,7 @@ public final class ProtoBuf {
        *hasConstant
        *isExternal
        *isDelegated
-       *isHeader
+       *isExpect
        * </pre>
        */
       public Builder setFlags(int value) {
@@ -16478,7 +16478,7 @@ public final class ProtoBuf {
        *hasConstant
        *isExternal
        *isDelegated
-       *isHeader
+       *isExpect
        * </pre>
        */
       public Builder clearFlags() {