diff --git a/modules/editor/file-templates/templates/java-mode/__ b/modules/editor/file-templates/templates/java-mode/__
index 2f45b0ca0..180f0a143 100644
--- a/modules/editor/file-templates/templates/java-mode/__
+++ b/modules/editor/file-templates/templates/java-mode/__
@@ -1,9 +1,9 @@
 # -*- mode: snippet -*-
 # name: Java file template
 # --
-package `(yas-java-project-package)`;
+package `(+java-current-package)`;
 
-public class `(yas-java-class-name)` $1
+public class `(+java-current-class)` $1
 {
     $0
 }
diff --git a/modules/editor/file-templates/templates/java-mode/__main b/modules/editor/file-templates/templates/java-mode/__main
index 20dde1223..748a9d96c 100644
--- a/modules/editor/file-templates/templates/java-mode/__main
+++ b/modules/editor/file-templates/templates/java-mode/__main
@@ -1,9 +1,9 @@
 # -*- mode: snippet -*-
 # name: Java MAIN file template
 # --
-package `(yas-java-project-package)`;
+package `(+java-current-package)`;
 
-public class `(yas-java-class-name)` $1
+public class `(+java-current-class)` $1
 {
     public static void main(String[] args) {
         $0