diff --git a/classlib/src/main/java/org/teavm/classlib/java/lang/TObject.java b/classlib/src/main/java/org/teavm/classlib/java/lang/TObject.java
index d6fad8ed6..306b40ddf 100644
--- a/classlib/src/main/java/org/teavm/classlib/java/lang/TObject.java
+++ b/classlib/src/main/java/org/teavm/classlib/java/lang/TObject.java
@@ -34,10 +34,6 @@ import org.teavm.runtime.RuntimeClass;
 import org.teavm.runtime.RuntimeJavaObject;
 import org.teavm.runtime.RuntimeObject;
 
-/**
- *
- * @author Alexey Andreev
- */
 @Superclass("")
 public class TObject {
     Monitor monitor;
diff --git a/core/src/main/java/org/teavm/backend/javascript/rendering/Renderer.java b/core/src/main/java/org/teavm/backend/javascript/rendering/Renderer.java
index 0fb45c5c9..632711a80 100644
--- a/core/src/main/java/org/teavm/backend/javascript/rendering/Renderer.java
+++ b/core/src/main/java/org/teavm/backend/javascript/rendering/Renderer.java
@@ -323,7 +323,7 @@ public class Renderer implements RenderingManager {
             }
 
             if (cls.getName().equals("java.lang.Object")) {
-                writer.append("this.$id").ws().append('=').ws().append("0;").softNewLine();
+                writer.append("this.$id$").ws().append('=').ws().append("0;").softNewLine();
             }
 
             writer.outdent().append("}").newLine();
diff --git a/core/src/main/resources/org/teavm/backend/javascript/runtime.js b/core/src/main/resources/org/teavm/backend/javascript/runtime.js
index bce7d151c..470db3011 100644
--- a/core/src/main/resources/org/teavm/backend/javascript/runtime.js
+++ b/core/src/main/resources/org/teavm/backend/javascript/runtime.js
@@ -124,7 +124,7 @@ function $rt_arraycls(cls) {
     if (result === null) {
         var arraycls = function(data) {
             this.data = data;
-            this.$id = 0;
+            this.$id$ = 0;
         };
         arraycls.prototype = new ($rt_objcls())();
         arraycls.prototype.constructor = arraycls;
diff --git a/platform/src/main/java/org/teavm/platform/PlatformObject.java b/platform/src/main/java/org/teavm/platform/PlatformObject.java
index 2b8b14eac..fd5ccca58 100644
--- a/platform/src/main/java/org/teavm/platform/PlatformObject.java
+++ b/platform/src/main/java/org/teavm/platform/PlatformObject.java
@@ -18,17 +18,13 @@ package org.teavm.platform;
 import org.teavm.jso.JSObject;
 import org.teavm.jso.JSProperty;
 
-/**
- *
- * @author Alexey Andreev
- */
 public interface PlatformObject extends JSObject {
     @JSProperty("constructor")
     PlatformClass getPlatformClass();
 
-    @JSProperty("$id")
+    @JSProperty("$id$")
     int getId();
 
-    @JSProperty("$id")
+    @JSProperty("$id$")
     void setId(int id);
 }