diff --git a/compiler/ir/serialization.common/src/KotlinIr.proto b/compiler/ir/serialization.common/src/KotlinIr.proto
index 943ccf883f9..e4156c88398 100644
--- a/compiler/ir/serialization.common/src/KotlinIr.proto
+++ b/compiler/ir/serialization.common/src/KotlinIr.proto
@@ -9,7 +9,7 @@ option optimize_for = LITE_RUNTIME;
 
 message FileEntry {
   required string name = 1;
-  repeated int32 line_start_offsets = 2 [packed=true];
+  repeated int32 line_start_offset = 2 [packed=true];
 }
 
 message IrFile {
@@ -18,7 +18,7 @@ message IrFile {
   repeated int32 fq_name = 3 [packed=true];
   repeated IrConstructorCall annotation = 4;
   repeated int64 explicitly_exported_to_compiler = 5 [packed=true];
-  repeated Actual actuals = 6;
+  repeated Actual actual = 6;
 }
 
 /* ------ IdSignature -------------------------------------------- */
@@ -131,7 +131,7 @@ message IrFunctionReference {
   required int64 symbol = 1;
   optional int32 origin_name = 2;
   required MemberAccessCommon member_access = 3;
-  optional int64 reflectionTargetSymbol = 4;
+  optional int64 reflection_target_symbol = 4;
 }
 
 message IrLocalDelegatedPropertyReference {
@@ -316,7 +316,7 @@ message IrErrorCallExpression {
 /* ------ Dynamic expression --------------------------------------------- */
 
 message IrDynamicMemberExpression {
-  required int32 memberName = 1;
+  required int32 member_name = 1;
   required IrExpression receiver = 2;
 }
 
@@ -483,7 +483,7 @@ message IrProperty {
 
 message IrVariable {
   required IrDeclarationBase base = 1;
-  required int64 name_type =2;
+  required int64 name_type = 2;
   optional IrExpression initializer = 3;
 }
 
@@ -597,6 +597,6 @@ message IrInlineClassRepresentation {
 }
 
 message PirBodyCarrier {
-  required int32 lastModified = 1;
-  optional int64 containerFieldSymbol = 2;
+  required int32 last_modified = 1;
+  optional int64 container_field_symbol = 2;
 }
diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrFileDeserializer.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrFileDeserializer.kt
index 47bea8262cd..94e278e0fc9 100644
--- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrFileDeserializer.kt
+++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrFileDeserializer.kt
@@ -7,7 +7,9 @@ package org.jetbrains.kotlin.backend.common.serialization
 
 import org.jetbrains.kotlin.descriptors.ModuleDescriptor
 import org.jetbrains.kotlin.descriptors.impl.EmptyPackageFragmentDescriptor
-import org.jetbrains.kotlin.ir.declarations.*
+import org.jetbrains.kotlin.ir.declarations.IrDeclaration
+import org.jetbrains.kotlin.ir.declarations.IrFile
+import org.jetbrains.kotlin.ir.declarations.IrModuleFragment
 import org.jetbrains.kotlin.ir.declarations.impl.IrFileImpl
 import org.jetbrains.kotlin.ir.symbols.impl.IrFileSymbolImpl
 import org.jetbrains.kotlin.ir.util.IdSignature
@@ -67,7 +69,9 @@ class FileDeserializationState(
 ) {
 
     val symbolDeserializer =
-        IrSymbolDeserializer(linker.symbolTable, fileReader, fileProto.actualsList, ::addIdSignature, linker::handleExpectActualMapping) { idSig, symbolKind ->
+        IrSymbolDeserializer(
+            linker.symbolTable, fileReader, fileProto.actualList, ::addIdSignature, linker::handleExpectActualMapping
+        ) { idSig, symbolKind ->
             assert(idSig.isPublic)
 
             val topLevelSig = idSig.topLevelSignature()
@@ -155,9 +159,9 @@ internal fun IrLibraryFile.deserializeFqName(fqn: List<Int>): String =
 
 internal fun IrLibraryFile.createFile(module: IrModuleFragment, fileProto: ProtoFile): IrFile {
     val fileName = fileProto.fileEntry.name
-    val fileEntry = NaiveSourceBasedFileEntryImpl(fileName, fileProto.fileEntry.lineStartOffsetsList.toIntArray())
+    val fileEntry = NaiveSourceBasedFileEntryImpl(fileName, fileProto.fileEntry.lineStartOffsetList.toIntArray())
     val fqName = FqName(deserializeFqName(fileProto.fqNameList))
     val packageFragmentDescriptor = EmptyPackageFragmentDescriptor(module.descriptor, fqName)
     val symbol = IrFileSymbolImpl(packageFragmentDescriptor)
     return IrFileImpl(fileEntry, symbol, fqName, module)
-}
\ No newline at end of file
+}
diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrFileSerializer.kt b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrFileSerializer.kt
index ee0da162722..09436851bd0 100644
--- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrFileSerializer.kt
+++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/IrFileSerializer.kt
@@ -1259,7 +1259,7 @@ open class IrFileSerializer(
 
     private fun serializeFileEntry(entry: IrFileEntry): ProtoFileEntry = ProtoFileEntry.newBuilder()
         .setName(entry.name)
-        .addAllLineStartOffsets(entry.lineStartOffsets.asIterable())
+        .addAllLineStartOffset(entry.lineStartOffsets.asIterable())
         .build()
 
     open fun backendSpecificExplicitRoot(node: IrAnnotationContainer): Boolean = false
@@ -1404,7 +1404,7 @@ open class IrFileSerializer(
         expectActualTable.table.forEach next@{ (expect, actualSymbol) ->
             val expectSymbol = expectDescriptorToSymbol[expect] ?: error("Could not find expect symbol for expect descriptor $expect")
 
-            proto.addActuals(
+            proto.addActual(
                 ProtoActual.newBuilder()
                     .setExpectSymbol(serializeIrSymbol(expectSymbol))
                     .setActualSymbol(serializeIrSymbol(actualSymbol))
diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/FileEntry.java b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/FileEntry.java
index 5944c088c59..055e1aec32e 100644
--- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/FileEntry.java
+++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/FileEntry.java
@@ -61,21 +61,21 @@ public final class FileEntry extends
           }
           case 16: {
             if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
-              lineStartOffsets_ = new java.util.ArrayList<java.lang.Integer>();
+              lineStartOffset_ = new java.util.ArrayList<java.lang.Integer>();
               mutable_bitField0_ |= 0x00000002;
             }
-            lineStartOffsets_.add(input.readInt32());
+            lineStartOffset_.add(input.readInt32());
             break;
           }
           case 18: {
             int length = input.readRawVarint32();
             int limit = input.pushLimit(length);
             if (!((mutable_bitField0_ & 0x00000002) == 0x00000002) && input.getBytesUntilLimit() > 0) {
-              lineStartOffsets_ = new java.util.ArrayList<java.lang.Integer>();
+              lineStartOffset_ = new java.util.ArrayList<java.lang.Integer>();
               mutable_bitField0_ |= 0x00000002;
             }
             while (input.getBytesUntilLimit() > 0) {
-              lineStartOffsets_.add(input.readInt32());
+              lineStartOffset_.add(input.readInt32());
             }
             input.popLimit(limit);
             break;
@@ -89,7 +89,7 @@ public final class FileEntry extends
           e.getMessage()).setUnfinishedMessage(this);
     } finally {
       if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
-        lineStartOffsets_ = java.util.Collections.unmodifiableList(lineStartOffsets_);
+        lineStartOffset_ = java.util.Collections.unmodifiableList(lineStartOffset_);
       }
       try {
         unknownFieldsCodedOutput.flush();
@@ -159,32 +159,32 @@ public final class FileEntry extends
     }
   }
 
-  public static final int LINE_START_OFFSETS_FIELD_NUMBER = 2;
-  private java.util.List<java.lang.Integer> lineStartOffsets_;
+  public static final int LINE_START_OFFSET_FIELD_NUMBER = 2;
+  private java.util.List<java.lang.Integer> lineStartOffset_;
   /**
-   * <code>repeated int32 line_start_offsets = 2 [packed = true];</code>
+   * <code>repeated int32 line_start_offset = 2 [packed = true];</code>
    */
   public java.util.List<java.lang.Integer>
-      getLineStartOffsetsList() {
-    return lineStartOffsets_;
+      getLineStartOffsetList() {
+    return lineStartOffset_;
   }
   /**
-   * <code>repeated int32 line_start_offsets = 2 [packed = true];</code>
+   * <code>repeated int32 line_start_offset = 2 [packed = true];</code>
    */
-  public int getLineStartOffsetsCount() {
-    return lineStartOffsets_.size();
+  public int getLineStartOffsetCount() {
+    return lineStartOffset_.size();
   }
   /**
-   * <code>repeated int32 line_start_offsets = 2 [packed = true];</code>
+   * <code>repeated int32 line_start_offset = 2 [packed = true];</code>
    */
-  public int getLineStartOffsets(int index) {
-    return lineStartOffsets_.get(index);
+  public int getLineStartOffset(int index) {
+    return lineStartOffset_.get(index);
   }
-  private int lineStartOffsetsMemoizedSerializedSize = -1;
+  private int lineStartOffsetMemoizedSerializedSize = -1;
 
   private void initFields() {
     name_ = "";
-    lineStartOffsets_ = java.util.Collections.emptyList();
+    lineStartOffset_ = java.util.Collections.emptyList();
   }
   private byte memoizedIsInitialized = -1;
   public final boolean isInitialized() {
@@ -206,12 +206,12 @@ public final class FileEntry extends
     if (((bitField0_ & 0x00000001) == 0x00000001)) {
       output.writeBytes(1, getNameBytes());
     }
-    if (getLineStartOffsetsList().size() > 0) {
+    if (getLineStartOffsetList().size() > 0) {
       output.writeRawVarint32(18);
-      output.writeRawVarint32(lineStartOffsetsMemoizedSerializedSize);
+      output.writeRawVarint32(lineStartOffsetMemoizedSerializedSize);
     }
-    for (int i = 0; i < lineStartOffsets_.size(); i++) {
-      output.writeInt32NoTag(lineStartOffsets_.get(i));
+    for (int i = 0; i < lineStartOffset_.size(); i++) {
+      output.writeInt32NoTag(lineStartOffset_.get(i));
     }
     output.writeRawBytes(unknownFields);
   }
@@ -228,17 +228,17 @@ public final class FileEntry extends
     }
     {
       int dataSize = 0;
-      for (int i = 0; i < lineStartOffsets_.size(); i++) {
+      for (int i = 0; i < lineStartOffset_.size(); i++) {
         dataSize += org.jetbrains.kotlin.protobuf.CodedOutputStream
-          .computeInt32SizeNoTag(lineStartOffsets_.get(i));
+          .computeInt32SizeNoTag(lineStartOffset_.get(i));
       }
       size += dataSize;
-      if (!getLineStartOffsetsList().isEmpty()) {
+      if (!getLineStartOffsetList().isEmpty()) {
         size += 1;
         size += org.jetbrains.kotlin.protobuf.CodedOutputStream
             .computeInt32SizeNoTag(dataSize);
       }
-      lineStartOffsetsMemoizedSerializedSize = dataSize;
+      lineStartOffsetMemoizedSerializedSize = dataSize;
     }
     size += unknownFields.size();
     memoizedSerializedSize = size;
@@ -336,7 +336,7 @@ public final class FileEntry extends
       super.clear();
       name_ = "";
       bitField0_ = (bitField0_ & ~0x00000001);
-      lineStartOffsets_ = java.util.Collections.emptyList();
+      lineStartOffset_ = java.util.Collections.emptyList();
       bitField0_ = (bitField0_ & ~0x00000002);
       return this;
     }
@@ -366,10 +366,10 @@ public final class FileEntry extends
       }
       result.name_ = name_;
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
-        lineStartOffsets_ = java.util.Collections.unmodifiableList(lineStartOffsets_);
+        lineStartOffset_ = java.util.Collections.unmodifiableList(lineStartOffset_);
         bitField0_ = (bitField0_ & ~0x00000002);
       }
-      result.lineStartOffsets_ = lineStartOffsets_;
+      result.lineStartOffset_ = lineStartOffset_;
       result.bitField0_ = to_bitField0_;
       return result;
     }
@@ -381,13 +381,13 @@ public final class FileEntry extends
         name_ = other.name_;
         
       }
-      if (!other.lineStartOffsets_.isEmpty()) {
-        if (lineStartOffsets_.isEmpty()) {
-          lineStartOffsets_ = other.lineStartOffsets_;
+      if (!other.lineStartOffset_.isEmpty()) {
+        if (lineStartOffset_.isEmpty()) {
+          lineStartOffset_ = other.lineStartOffset_;
           bitField0_ = (bitField0_ & ~0x00000002);
         } else {
-          ensureLineStartOffsetsIsMutable();
-          lineStartOffsets_.addAll(other.lineStartOffsets_);
+          ensureLineStartOffsetIsMutable();
+          lineStartOffset_.addAll(other.lineStartOffset_);
         }
         
       }
@@ -499,67 +499,67 @@ public final class FileEntry extends
       return this;
     }
 
-    private java.util.List<java.lang.Integer> lineStartOffsets_ = java.util.Collections.emptyList();
-    private void ensureLineStartOffsetsIsMutable() {
+    private java.util.List<java.lang.Integer> lineStartOffset_ = java.util.Collections.emptyList();
+    private void ensureLineStartOffsetIsMutable() {
       if (!((bitField0_ & 0x00000002) == 0x00000002)) {
-        lineStartOffsets_ = new java.util.ArrayList<java.lang.Integer>(lineStartOffsets_);
+        lineStartOffset_ = new java.util.ArrayList<java.lang.Integer>(lineStartOffset_);
         bitField0_ |= 0x00000002;
        }
     }
     /**
-     * <code>repeated int32 line_start_offsets = 2 [packed = true];</code>
+     * <code>repeated int32 line_start_offset = 2 [packed = true];</code>
      */
     public java.util.List<java.lang.Integer>
-        getLineStartOffsetsList() {
-      return java.util.Collections.unmodifiableList(lineStartOffsets_);
+        getLineStartOffsetList() {
+      return java.util.Collections.unmodifiableList(lineStartOffset_);
     }
     /**
-     * <code>repeated int32 line_start_offsets = 2 [packed = true];</code>
+     * <code>repeated int32 line_start_offset = 2 [packed = true];</code>
      */
-    public int getLineStartOffsetsCount() {
-      return lineStartOffsets_.size();
+    public int getLineStartOffsetCount() {
+      return lineStartOffset_.size();
     }
     /**
-     * <code>repeated int32 line_start_offsets = 2 [packed = true];</code>
+     * <code>repeated int32 line_start_offset = 2 [packed = true];</code>
      */
-    public int getLineStartOffsets(int index) {
-      return lineStartOffsets_.get(index);
+    public int getLineStartOffset(int index) {
+      return lineStartOffset_.get(index);
     }
     /**
-     * <code>repeated int32 line_start_offsets = 2 [packed = true];</code>
+     * <code>repeated int32 line_start_offset = 2 [packed = true];</code>
      */
-    public Builder setLineStartOffsets(
+    public Builder setLineStartOffset(
         int index, int value) {
-      ensureLineStartOffsetsIsMutable();
-      lineStartOffsets_.set(index, value);
+      ensureLineStartOffsetIsMutable();
+      lineStartOffset_.set(index, value);
       
       return this;
     }
     /**
-     * <code>repeated int32 line_start_offsets = 2 [packed = true];</code>
+     * <code>repeated int32 line_start_offset = 2 [packed = true];</code>
      */
-    public Builder addLineStartOffsets(int value) {
-      ensureLineStartOffsetsIsMutable();
-      lineStartOffsets_.add(value);
+    public Builder addLineStartOffset(int value) {
+      ensureLineStartOffsetIsMutable();
+      lineStartOffset_.add(value);
       
       return this;
     }
     /**
-     * <code>repeated int32 line_start_offsets = 2 [packed = true];</code>
+     * <code>repeated int32 line_start_offset = 2 [packed = true];</code>
      */
-    public Builder addAllLineStartOffsets(
+    public Builder addAllLineStartOffset(
         java.lang.Iterable<? extends java.lang.Integer> values) {
-      ensureLineStartOffsetsIsMutable();
+      ensureLineStartOffsetIsMutable();
       org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
-          values, lineStartOffsets_);
+          values, lineStartOffset_);
       
       return this;
     }
     /**
-     * <code>repeated int32 line_start_offsets = 2 [packed = true];</code>
+     * <code>repeated int32 line_start_offset = 2 [packed = true];</code>
      */
-    public Builder clearLineStartOffsets() {
-      lineStartOffsets_ = java.util.Collections.emptyList();
+    public Builder clearLineStartOffset() {
+      lineStartOffset_ = java.util.Collections.emptyList();
       bitField0_ = (bitField0_ & ~0x00000002);
       
       return this;
diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/FileEntryOrBuilder.java b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/FileEntryOrBuilder.java
index 15da54fb850..fe2a1b48f00 100644
--- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/FileEntryOrBuilder.java
+++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/FileEntryOrBuilder.java
@@ -22,15 +22,15 @@ public interface FileEntryOrBuilder extends
       getNameBytes();
 
   /**
-   * <code>repeated int32 line_start_offsets = 2 [packed = true];</code>
+   * <code>repeated int32 line_start_offset = 2 [packed = true];</code>
    */
-  java.util.List<java.lang.Integer> getLineStartOffsetsList();
+  java.util.List<java.lang.Integer> getLineStartOffsetList();
   /**
-   * <code>repeated int32 line_start_offsets = 2 [packed = true];</code>
+   * <code>repeated int32 line_start_offset = 2 [packed = true];</code>
    */
-  int getLineStartOffsetsCount();
+  int getLineStartOffsetCount();
   /**
-   * <code>repeated int32 line_start_offsets = 2 [packed = true];</code>
+   * <code>repeated int32 line_start_offset = 2 [packed = true];</code>
    */
-  int getLineStartOffsets(int index);
+  int getLineStartOffset(int index);
 }
\ No newline at end of file
diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrDynamicMemberExpression.java b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrDynamicMemberExpression.java
index ecc755d3cb1..3bb7d400498 100644
--- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrDynamicMemberExpression.java
+++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrDynamicMemberExpression.java
@@ -105,16 +105,16 @@ public final class IrDynamicMemberExpression extends
   }
 
   private int bitField0_;
-  public static final int MEMBERNAME_FIELD_NUMBER = 1;
+  public static final int MEMBER_NAME_FIELD_NUMBER = 1;
   private int memberName_;
   /**
-   * <code>required int32 memberName = 1;</code>
+   * <code>required int32 member_name = 1;</code>
    */
   public boolean hasMemberName() {
     return ((bitField0_ & 0x00000001) == 0x00000001);
   }
   /**
-   * <code>required int32 memberName = 1;</code>
+   * <code>required int32 member_name = 1;</code>
    */
   public int getMemberName() {
     return memberName_;
@@ -370,19 +370,19 @@ public final class IrDynamicMemberExpression extends
 
     private int memberName_ ;
     /**
-     * <code>required int32 memberName = 1;</code>
+     * <code>required int32 member_name = 1;</code>
      */
     public boolean hasMemberName() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * <code>required int32 memberName = 1;</code>
+     * <code>required int32 member_name = 1;</code>
      */
     public int getMemberName() {
       return memberName_;
     }
     /**
-     * <code>required int32 memberName = 1;</code>
+     * <code>required int32 member_name = 1;</code>
      */
     public Builder setMemberName(int value) {
       bitField0_ |= 0x00000001;
@@ -391,7 +391,7 @@ public final class IrDynamicMemberExpression extends
       return this;
     }
     /**
-     * <code>required int32 memberName = 1;</code>
+     * <code>required int32 member_name = 1;</code>
      */
     public Builder clearMemberName() {
       bitField0_ = (bitField0_ & ~0x00000001);
diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrDynamicMemberExpressionOrBuilder.java b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrDynamicMemberExpressionOrBuilder.java
index 7881c4de8f4..19dbcc1ce1b 100644
--- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrDynamicMemberExpressionOrBuilder.java
+++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrDynamicMemberExpressionOrBuilder.java
@@ -8,11 +8,11 @@ public interface IrDynamicMemberExpressionOrBuilder extends
     org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
 
   /**
-   * <code>required int32 memberName = 1;</code>
+   * <code>required int32 member_name = 1;</code>
    */
   boolean hasMemberName();
   /**
-   * <code>required int32 memberName = 1;</code>
+   * <code>required int32 member_name = 1;</code>
    */
   int getMemberName();
 
diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrFile.java b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrFile.java
index 5f7f53461e8..e810acd631a 100644
--- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrFile.java
+++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrFile.java
@@ -139,10 +139,10 @@ public final class IrFile extends
           }
           case 50: {
             if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) {
-              actuals_ = new java.util.ArrayList<org.jetbrains.kotlin.backend.common.serialization.proto.Actual>();
+              actual_ = new java.util.ArrayList<org.jetbrains.kotlin.backend.common.serialization.proto.Actual>();
               mutable_bitField0_ |= 0x00000020;
             }
-            actuals_.add(input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.Actual.PARSER, extensionRegistry));
+            actual_.add(input.readMessage(org.jetbrains.kotlin.backend.common.serialization.proto.Actual.PARSER, extensionRegistry));
             break;
           }
         }
@@ -166,7 +166,7 @@ public final class IrFile extends
         explicitlyExportedToCompiler_ = java.util.Collections.unmodifiableList(explicitlyExportedToCompiler_);
       }
       if (((mutable_bitField0_ & 0x00000020) == 0x00000020)) {
-        actuals_ = java.util.Collections.unmodifiableList(actuals_);
+        actual_ = java.util.Collections.unmodifiableList(actual_);
       }
       try {
         unknownFieldsCodedOutput.flush();
@@ -313,39 +313,39 @@ public final class IrFile extends
   }
   private int explicitlyExportedToCompilerMemoizedSerializedSize = -1;
 
-  public static final int ACTUALS_FIELD_NUMBER = 6;
-  private java.util.List<org.jetbrains.kotlin.backend.common.serialization.proto.Actual> actuals_;
+  public static final int ACTUAL_FIELD_NUMBER = 6;
+  private java.util.List<org.jetbrains.kotlin.backend.common.serialization.proto.Actual> actual_;
   /**
-   * <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.Actual actuals = 6;</code>
+   * <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.Actual actual = 6;</code>
    */
-  public java.util.List<org.jetbrains.kotlin.backend.common.serialization.proto.Actual> getActualsList() {
-    return actuals_;
+  public java.util.List<org.jetbrains.kotlin.backend.common.serialization.proto.Actual> getActualList() {
+    return actual_;
   }
   /**
-   * <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.Actual actuals = 6;</code>
+   * <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.Actual actual = 6;</code>
    */
   public java.util.List<? extends org.jetbrains.kotlin.backend.common.serialization.proto.ActualOrBuilder> 
-      getActualsOrBuilderList() {
-    return actuals_;
+      getActualOrBuilderList() {
+    return actual_;
   }
   /**
-   * <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.Actual actuals = 6;</code>
+   * <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.Actual actual = 6;</code>
    */
-  public int getActualsCount() {
-    return actuals_.size();
+  public int getActualCount() {
+    return actual_.size();
   }
   /**
-   * <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.Actual actuals = 6;</code>
+   * <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.Actual actual = 6;</code>
    */
-  public org.jetbrains.kotlin.backend.common.serialization.proto.Actual getActuals(int index) {
-    return actuals_.get(index);
+  public org.jetbrains.kotlin.backend.common.serialization.proto.Actual getActual(int index) {
+    return actual_.get(index);
   }
   /**
-   * <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.Actual actuals = 6;</code>
+   * <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.Actual actual = 6;</code>
    */
-  public org.jetbrains.kotlin.backend.common.serialization.proto.ActualOrBuilder getActualsOrBuilder(
+  public org.jetbrains.kotlin.backend.common.serialization.proto.ActualOrBuilder getActualOrBuilder(
       int index) {
-    return actuals_.get(index);
+    return actual_.get(index);
   }
 
   private void initFields() {
@@ -354,7 +354,7 @@ public final class IrFile extends
     fqName_ = java.util.Collections.emptyList();
     annotation_ = java.util.Collections.emptyList();
     explicitlyExportedToCompiler_ = java.util.Collections.emptyList();
-    actuals_ = java.util.Collections.emptyList();
+    actual_ = java.util.Collections.emptyList();
   }
   private byte memoizedIsInitialized = -1;
   public final boolean isInitialized() {
@@ -376,8 +376,8 @@ public final class IrFile extends
         return false;
       }
     }
-    for (int i = 0; i < getActualsCount(); i++) {
-      if (!getActuals(i).isInitialized()) {
+    for (int i = 0; i < getActualCount(); i++) {
+      if (!getActual(i).isInitialized()) {
         memoizedIsInitialized = 0;
         return false;
       }
@@ -416,8 +416,8 @@ public final class IrFile extends
     for (int i = 0; i < explicitlyExportedToCompiler_.size(); i++) {
       output.writeInt64NoTag(explicitlyExportedToCompiler_.get(i));
     }
-    for (int i = 0; i < actuals_.size(); i++) {
-      output.writeMessage(6, actuals_.get(i));
+    for (int i = 0; i < actual_.size(); i++) {
+      output.writeMessage(6, actual_.get(i));
     }
     output.writeRawBytes(unknownFields);
   }
@@ -478,9 +478,9 @@ public final class IrFile extends
       }
       explicitlyExportedToCompilerMemoizedSerializedSize = dataSize;
     }
-    for (int i = 0; i < actuals_.size(); i++) {
+    for (int i = 0; i < actual_.size(); i++) {
       size += org.jetbrains.kotlin.protobuf.CodedOutputStream
-        .computeMessageSize(6, actuals_.get(i));
+        .computeMessageSize(6, actual_.get(i));
     }
     size += unknownFields.size();
     memoizedSerializedSize = size;
@@ -586,7 +586,7 @@ public final class IrFile extends
       bitField0_ = (bitField0_ & ~0x00000008);
       explicitlyExportedToCompiler_ = java.util.Collections.emptyList();
       bitField0_ = (bitField0_ & ~0x00000010);
-      actuals_ = java.util.Collections.emptyList();
+      actual_ = java.util.Collections.emptyList();
       bitField0_ = (bitField0_ & ~0x00000020);
       return this;
     }
@@ -636,10 +636,10 @@ public final class IrFile extends
       }
       result.explicitlyExportedToCompiler_ = explicitlyExportedToCompiler_;
       if (((bitField0_ & 0x00000020) == 0x00000020)) {
-        actuals_ = java.util.Collections.unmodifiableList(actuals_);
+        actual_ = java.util.Collections.unmodifiableList(actual_);
         bitField0_ = (bitField0_ & ~0x00000020);
       }
-      result.actuals_ = actuals_;
+      result.actual_ = actual_;
       result.bitField0_ = to_bitField0_;
       return result;
     }
@@ -689,13 +689,13 @@ public final class IrFile extends
         }
         
       }
-      if (!other.actuals_.isEmpty()) {
-        if (actuals_.isEmpty()) {
-          actuals_ = other.actuals_;
+      if (!other.actual_.isEmpty()) {
+        if (actual_.isEmpty()) {
+          actual_ = other.actual_;
           bitField0_ = (bitField0_ & ~0x00000020);
         } else {
-          ensureActualsIsMutable();
-          actuals_.addAll(other.actuals_);
+          ensureActualIsMutable();
+          actual_.addAll(other.actual_);
         }
         
       }
@@ -719,8 +719,8 @@ public final class IrFile extends
           return false;
         }
       }
-      for (int i = 0; i < getActualsCount(); i++) {
-        if (!getActuals(i).isInitialized()) {
+      for (int i = 0; i < getActualCount(); i++) {
+        if (!getActual(i).isInitialized()) {
           
           return false;
         }
@@ -1130,127 +1130,127 @@ public final class IrFile extends
       return this;
     }
 
-    private java.util.List<org.jetbrains.kotlin.backend.common.serialization.proto.Actual> actuals_ =
+    private java.util.List<org.jetbrains.kotlin.backend.common.serialization.proto.Actual> actual_ =
       java.util.Collections.emptyList();
-    private void ensureActualsIsMutable() {
+    private void ensureActualIsMutable() {
       if (!((bitField0_ & 0x00000020) == 0x00000020)) {
-        actuals_ = new java.util.ArrayList<org.jetbrains.kotlin.backend.common.serialization.proto.Actual>(actuals_);
+        actual_ = new java.util.ArrayList<org.jetbrains.kotlin.backend.common.serialization.proto.Actual>(actual_);
         bitField0_ |= 0x00000020;
        }
     }
 
     /**
-     * <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.Actual actuals = 6;</code>
+     * <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.Actual actual = 6;</code>
      */
-    public java.util.List<org.jetbrains.kotlin.backend.common.serialization.proto.Actual> getActualsList() {
-      return java.util.Collections.unmodifiableList(actuals_);
+    public java.util.List<org.jetbrains.kotlin.backend.common.serialization.proto.Actual> getActualList() {
+      return java.util.Collections.unmodifiableList(actual_);
     }
     /**
-     * <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.Actual actuals = 6;</code>
+     * <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.Actual actual = 6;</code>
      */
-    public int getActualsCount() {
-      return actuals_.size();
+    public int getActualCount() {
+      return actual_.size();
     }
     /**
-     * <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.Actual actuals = 6;</code>
+     * <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.Actual actual = 6;</code>
      */
-    public org.jetbrains.kotlin.backend.common.serialization.proto.Actual getActuals(int index) {
-      return actuals_.get(index);
+    public org.jetbrains.kotlin.backend.common.serialization.proto.Actual getActual(int index) {
+      return actual_.get(index);
     }
     /**
-     * <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.Actual actuals = 6;</code>
+     * <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.Actual actual = 6;</code>
      */
-    public Builder setActuals(
+    public Builder setActual(
         int index, org.jetbrains.kotlin.backend.common.serialization.proto.Actual value) {
       if (value == null) {
         throw new NullPointerException();
       }
-      ensureActualsIsMutable();
-      actuals_.set(index, value);
+      ensureActualIsMutable();
+      actual_.set(index, value);
 
       return this;
     }
     /**
-     * <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.Actual actuals = 6;</code>
+     * <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.Actual actual = 6;</code>
      */
-    public Builder setActuals(
+    public Builder setActual(
         int index, org.jetbrains.kotlin.backend.common.serialization.proto.Actual.Builder builderForValue) {
-      ensureActualsIsMutable();
-      actuals_.set(index, builderForValue.build());
+      ensureActualIsMutable();
+      actual_.set(index, builderForValue.build());
 
       return this;
     }
     /**
-     * <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.Actual actuals = 6;</code>
+     * <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.Actual actual = 6;</code>
      */
-    public Builder addActuals(org.jetbrains.kotlin.backend.common.serialization.proto.Actual value) {
+    public Builder addActual(org.jetbrains.kotlin.backend.common.serialization.proto.Actual value) {
       if (value == null) {
         throw new NullPointerException();
       }
-      ensureActualsIsMutable();
-      actuals_.add(value);
+      ensureActualIsMutable();
+      actual_.add(value);
 
       return this;
     }
     /**
-     * <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.Actual actuals = 6;</code>
+     * <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.Actual actual = 6;</code>
      */
-    public Builder addActuals(
+    public Builder addActual(
         int index, org.jetbrains.kotlin.backend.common.serialization.proto.Actual value) {
       if (value == null) {
         throw new NullPointerException();
       }
-      ensureActualsIsMutable();
-      actuals_.add(index, value);
+      ensureActualIsMutable();
+      actual_.add(index, value);
 
       return this;
     }
     /**
-     * <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.Actual actuals = 6;</code>
+     * <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.Actual actual = 6;</code>
      */
-    public Builder addActuals(
+    public Builder addActual(
         org.jetbrains.kotlin.backend.common.serialization.proto.Actual.Builder builderForValue) {
-      ensureActualsIsMutable();
-      actuals_.add(builderForValue.build());
+      ensureActualIsMutable();
+      actual_.add(builderForValue.build());
 
       return this;
     }
     /**
-     * <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.Actual actuals = 6;</code>
+     * <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.Actual actual = 6;</code>
      */
-    public Builder addActuals(
+    public Builder addActual(
         int index, org.jetbrains.kotlin.backend.common.serialization.proto.Actual.Builder builderForValue) {
-      ensureActualsIsMutable();
-      actuals_.add(index, builderForValue.build());
+      ensureActualIsMutable();
+      actual_.add(index, builderForValue.build());
 
       return this;
     }
     /**
-     * <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.Actual actuals = 6;</code>
+     * <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.Actual actual = 6;</code>
      */
-    public Builder addAllActuals(
+    public Builder addAllActual(
         java.lang.Iterable<? extends org.jetbrains.kotlin.backend.common.serialization.proto.Actual> values) {
-      ensureActualsIsMutable();
+      ensureActualIsMutable();
       org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll(
-          values, actuals_);
+          values, actual_);
 
       return this;
     }
     /**
-     * <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.Actual actuals = 6;</code>
+     * <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.Actual actual = 6;</code>
      */
-    public Builder clearActuals() {
-      actuals_ = java.util.Collections.emptyList();
+    public Builder clearActual() {
+      actual_ = java.util.Collections.emptyList();
       bitField0_ = (bitField0_ & ~0x00000020);
 
       return this;
     }
     /**
-     * <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.Actual actuals = 6;</code>
+     * <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.Actual actual = 6;</code>
      */
-    public Builder removeActuals(int index) {
-      ensureActualsIsMutable();
-      actuals_.remove(index);
+    public Builder removeActual(int index) {
+      ensureActualIsMutable();
+      actual_.remove(index);
 
       return this;
     }
diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrFileOrBuilder.java b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrFileOrBuilder.java
index ab48bf873f6..2a590b8f935 100644
--- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrFileOrBuilder.java
+++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrFileOrBuilder.java
@@ -70,16 +70,16 @@ public interface IrFileOrBuilder extends
   long getExplicitlyExportedToCompiler(int index);
 
   /**
-   * <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.Actual actuals = 6;</code>
+   * <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.Actual actual = 6;</code>
    */
   java.util.List<org.jetbrains.kotlin.backend.common.serialization.proto.Actual> 
-      getActualsList();
+      getActualList();
   /**
-   * <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.Actual actuals = 6;</code>
+   * <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.Actual actual = 6;</code>
    */
-  org.jetbrains.kotlin.backend.common.serialization.proto.Actual getActuals(int index);
+  org.jetbrains.kotlin.backend.common.serialization.proto.Actual getActual(int index);
   /**
-   * <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.Actual actuals = 6;</code>
+   * <code>repeated .org.jetbrains.kotlin.backend.common.serialization.proto.Actual actual = 6;</code>
    */
-  int getActualsCount();
+  int getActualCount();
 }
\ No newline at end of file
diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrFunctionReference.java b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrFunctionReference.java
index e0708ec433b..99b6ff42b35 100644
--- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrFunctionReference.java
+++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrFunctionReference.java
@@ -160,16 +160,16 @@ public final class IrFunctionReference extends
     return memberAccess_;
   }
 
-  public static final int REFLECTIONTARGETSYMBOL_FIELD_NUMBER = 4;
+  public static final int REFLECTION_TARGET_SYMBOL_FIELD_NUMBER = 4;
   private long reflectionTargetSymbol_;
   /**
-   * <code>optional int64 reflectionTargetSymbol = 4;</code>
+   * <code>optional int64 reflection_target_symbol = 4;</code>
    */
   public boolean hasReflectionTargetSymbol() {
     return ((bitField0_ & 0x00000008) == 0x00000008);
   }
   /**
-   * <code>optional int64 reflectionTargetSymbol = 4;</code>
+   * <code>optional int64 reflection_target_symbol = 4;</code>
    */
   public long getReflectionTargetSymbol() {
     return reflectionTargetSymbol_;
@@ -568,19 +568,19 @@ public final class IrFunctionReference extends
 
     private long reflectionTargetSymbol_ ;
     /**
-     * <code>optional int64 reflectionTargetSymbol = 4;</code>
+     * <code>optional int64 reflection_target_symbol = 4;</code>
      */
     public boolean hasReflectionTargetSymbol() {
       return ((bitField0_ & 0x00000008) == 0x00000008);
     }
     /**
-     * <code>optional int64 reflectionTargetSymbol = 4;</code>
+     * <code>optional int64 reflection_target_symbol = 4;</code>
      */
     public long getReflectionTargetSymbol() {
       return reflectionTargetSymbol_;
     }
     /**
-     * <code>optional int64 reflectionTargetSymbol = 4;</code>
+     * <code>optional int64 reflection_target_symbol = 4;</code>
      */
     public Builder setReflectionTargetSymbol(long value) {
       bitField0_ |= 0x00000008;
@@ -589,7 +589,7 @@ public final class IrFunctionReference extends
       return this;
     }
     /**
-     * <code>optional int64 reflectionTargetSymbol = 4;</code>
+     * <code>optional int64 reflection_target_symbol = 4;</code>
      */
     public Builder clearReflectionTargetSymbol() {
       bitField0_ = (bitField0_ & ~0x00000008);
diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrFunctionReferenceOrBuilder.java b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrFunctionReferenceOrBuilder.java
index fbe28e06d78..2f35d5c4814 100644
--- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrFunctionReferenceOrBuilder.java
+++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/IrFunctionReferenceOrBuilder.java
@@ -35,11 +35,11 @@ public interface IrFunctionReferenceOrBuilder extends
   org.jetbrains.kotlin.backend.common.serialization.proto.MemberAccessCommon getMemberAccess();
 
   /**
-   * <code>optional int64 reflectionTargetSymbol = 4;</code>
+   * <code>optional int64 reflection_target_symbol = 4;</code>
    */
   boolean hasReflectionTargetSymbol();
   /**
-   * <code>optional int64 reflectionTargetSymbol = 4;</code>
+   * <code>optional int64 reflection_target_symbol = 4;</code>
    */
   long getReflectionTargetSymbol();
 }
\ No newline at end of file
diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/PirBodyCarrier.java b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/PirBodyCarrier.java
index fab9bed15f6..b11445f7c47 100644
--- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/PirBodyCarrier.java
+++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/PirBodyCarrier.java
@@ -97,31 +97,31 @@ public final class PirBodyCarrier extends
   }
 
   private int bitField0_;
-  public static final int LASTMODIFIED_FIELD_NUMBER = 1;
+  public static final int LAST_MODIFIED_FIELD_NUMBER = 1;
   private int lastModified_;
   /**
-   * <code>required int32 lastModified = 1;</code>
+   * <code>required int32 last_modified = 1;</code>
    */
   public boolean hasLastModified() {
     return ((bitField0_ & 0x00000001) == 0x00000001);
   }
   /**
-   * <code>required int32 lastModified = 1;</code>
+   * <code>required int32 last_modified = 1;</code>
    */
   public int getLastModified() {
     return lastModified_;
   }
 
-  public static final int CONTAINERFIELDSYMBOL_FIELD_NUMBER = 2;
+  public static final int CONTAINER_FIELD_SYMBOL_FIELD_NUMBER = 2;
   private long containerFieldSymbol_;
   /**
-   * <code>optional int64 containerFieldSymbol = 2;</code>
+   * <code>optional int64 container_field_symbol = 2;</code>
    */
   public boolean hasContainerFieldSymbol() {
     return ((bitField0_ & 0x00000002) == 0x00000002);
   }
   /**
-   * <code>optional int64 containerFieldSymbol = 2;</code>
+   * <code>optional int64 container_field_symbol = 2;</code>
    */
   public long getContainerFieldSymbol() {
     return containerFieldSymbol_;
@@ -346,19 +346,19 @@ public final class PirBodyCarrier extends
 
     private int lastModified_ ;
     /**
-     * <code>required int32 lastModified = 1;</code>
+     * <code>required int32 last_modified = 1;</code>
      */
     public boolean hasLastModified() {
       return ((bitField0_ & 0x00000001) == 0x00000001);
     }
     /**
-     * <code>required int32 lastModified = 1;</code>
+     * <code>required int32 last_modified = 1;</code>
      */
     public int getLastModified() {
       return lastModified_;
     }
     /**
-     * <code>required int32 lastModified = 1;</code>
+     * <code>required int32 last_modified = 1;</code>
      */
     public Builder setLastModified(int value) {
       bitField0_ |= 0x00000001;
@@ -367,7 +367,7 @@ public final class PirBodyCarrier extends
       return this;
     }
     /**
-     * <code>required int32 lastModified = 1;</code>
+     * <code>required int32 last_modified = 1;</code>
      */
     public Builder clearLastModified() {
       bitField0_ = (bitField0_ & ~0x00000001);
@@ -378,19 +378,19 @@ public final class PirBodyCarrier extends
 
     private long containerFieldSymbol_ ;
     /**
-     * <code>optional int64 containerFieldSymbol = 2;</code>
+     * <code>optional int64 container_field_symbol = 2;</code>
      */
     public boolean hasContainerFieldSymbol() {
       return ((bitField0_ & 0x00000002) == 0x00000002);
     }
     /**
-     * <code>optional int64 containerFieldSymbol = 2;</code>
+     * <code>optional int64 container_field_symbol = 2;</code>
      */
     public long getContainerFieldSymbol() {
       return containerFieldSymbol_;
     }
     /**
-     * <code>optional int64 containerFieldSymbol = 2;</code>
+     * <code>optional int64 container_field_symbol = 2;</code>
      */
     public Builder setContainerFieldSymbol(long value) {
       bitField0_ |= 0x00000002;
@@ -399,7 +399,7 @@ public final class PirBodyCarrier extends
       return this;
     }
     /**
-     * <code>optional int64 containerFieldSymbol = 2;</code>
+     * <code>optional int64 container_field_symbol = 2;</code>
      */
     public Builder clearContainerFieldSymbol() {
       bitField0_ = (bitField0_ & ~0x00000002);
diff --git a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/PirBodyCarrierOrBuilder.java b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/PirBodyCarrierOrBuilder.java
index 1074bd3b087..e8c66ee36f0 100644
--- a/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/PirBodyCarrierOrBuilder.java
+++ b/compiler/ir/serialization.common/src/org/jetbrains/kotlin/backend/common/serialization/proto/PirBodyCarrierOrBuilder.java
@@ -8,20 +8,20 @@ public interface PirBodyCarrierOrBuilder extends
     org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
 
   /**
-   * <code>required int32 lastModified = 1;</code>
+   * <code>required int32 last_modified = 1;</code>
    */
   boolean hasLastModified();
   /**
-   * <code>required int32 lastModified = 1;</code>
+   * <code>required int32 last_modified = 1;</code>
    */
   int getLastModified();
 
   /**
-   * <code>optional int64 containerFieldSymbol = 2;</code>
+   * <code>optional int64 container_field_symbol = 2;</code>
    */
   boolean hasContainerFieldSymbol();
   /**
-   * <code>optional int64 containerFieldSymbol = 2;</code>
+   * <code>optional int64 container_field_symbol = 2;</code>
    */
   long getContainerFieldSymbol();
 }
\ No newline at end of file