diff --git a/core b/core
index eb614bee9d..08049367bc 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit eb614bee9d7aca4420d97c346a660b94ed0879a9
+Subproject commit 08049367bc6fbcfce97f99fd52058b1f15917ef6
diff --git a/typespec-extension/changelog.md b/typespec-extension/changelog.md
index 456f6472c5..84629d9f3b 100644
--- a/typespec-extension/changelog.md
+++ b/typespec-extension/changelog.md
@@ -1,5 +1,9 @@
 # Release History
 
+## 0.31.1 (2025-06-04)
+
+Compatible with compiler 1.0.0.
+
 ## 0.31.0 (2025-05-28)
 
 Compatible with compiler 1.0.0.
diff --git a/typespec-extension/package-lock.json b/typespec-extension/package-lock.json
index d782281e18..7af0bb60ea 100644
--- a/typespec-extension/package-lock.json
+++ b/typespec-extension/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@azure-tools/typespec-java",
-  "version": "0.31.0",
+  "version": "0.31.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@azure-tools/typespec-java",
-      "version": "0.31.0",
+      "version": "0.31.1",
       "license": "MIT",
       "dependencies": {
         "@autorest/codemodel": "~4.20.1",
diff --git a/typespec-extension/package.json b/typespec-extension/package.json
index 1bbf9a3e06..97bb8c5fd0 100644
--- a/typespec-extension/package.json
+++ b/typespec-extension/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@azure-tools/typespec-java",
-  "version": "0.31.0",
+  "version": "0.31.1",
   "description": "TypeSpec library for emitting Java client from the TypeSpec REST protocol binding",
   "keywords": [
     "TypeSpec"
diff --git a/typespec-extension/src/options.ts b/typespec-extension/src/options.ts
index 764d7a90eb..7185c87f06 100644
--- a/typespec-extension/src/options.ts
+++ b/typespec-extension/src/options.ts
@@ -115,6 +115,12 @@ export const EmitterOptionsSchema: JSONSchemaType<EmitterOptions> = {
       description: "Specify the Java class that to be executed by emitter for [code customization](https://github.com/Azure/autorest.java/blob/main/customization-base/README.md), during post-process.",
       nullable: true,
     },
+    "rename-model": {
+      type: ["string", "object"],
+      description: "Specify models to rename, in case unable to do so through TCGC. E.g. anonymous models or resource list models. Format should be in key-value form, or a comma separated string that follows 'BeforeRename:AfterRename' pattern.",
+      additionalProperties: true,
+      nullable: true,
+    },
 
     // configure
     "skip-special-headers": {
diff --git a/typespec-tests/package.json b/typespec-tests/package.json
index 790de3ea88..105c705a45 100644
--- a/typespec-tests/package.json
+++ b/typespec-tests/package.json
@@ -13,7 +13,7 @@
     "@typespec/spector": "0.1.0-alpha.14",
     "@typespec/http-specs": "0.1.0-alpha.22",
     "@azure-tools/azure-http-specs": "0.1.0-alpha.18",
-    "@azure-tools/typespec-java": "file:/../typespec-extension/azure-tools-typespec-java-0.31.0.tgz"
+    "@azure-tools/typespec-java": "file:/../typespec-extension/azure-tools-typespec-java-0.31.1.tgz"
   },
   "devDependencies": {
     "@typespec/prettier-plugin-typespec": "^1.0.0",