diff --git a/truffle/src/com.oracle.truffle.api.instrumentation/src/com/oracle/truffle/api/instrumentation/InstrumentationHandler.java b/truffle/src/com.oracle.truffle.api.instrumentation/src/com/oracle/truffle/api/instrumentation/InstrumentationHandler.java
index 174ba8dfb1661..6170dca0228ec 100644
--- a/truffle/src/com.oracle.truffle.api.instrumentation/src/com/oracle/truffle/api/instrumentation/InstrumentationHandler.java
+++ b/truffle/src/com.oracle.truffle.api.instrumentation/src/com/oracle/truffle/api/instrumentation/InstrumentationHandler.java
@@ -2268,10 +2268,10 @@ void create(String[] expectedServices) {
         }
 
         private boolean checkServices(String[] expectedServices) {
-            LOOP: for (String name : expectedServices) {
+            loop: for (String name : expectedServices) {
                 for (Object obj : services) {
                     if (findType(name, obj.getClass())) {
-                        continue LOOP;
+                        continue loop;
                     }
                 }
                 failInstrumentInitialization(env, String.format("%s declares service %s but doesn't register it", instrumentClassName, name), null);
diff --git a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotContextImpl.java b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotContextImpl.java
index 5907c3fdf3b8d..c7007c44fb89f 100644
--- a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotContextImpl.java
+++ b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotContextImpl.java
@@ -832,7 +832,7 @@ Object[] enterThreadChanged(boolean enterReverted, boolean pollSafepoint, boolea
                     throw PolyglotEngineException.illegalState("Context cannot be entered in polyglot thread's beforeEnter or afterLeave notifications.");
                 }
                 PolyglotThreadAccessException threadAccessException = null;
-                LOOP: for (;;) {
+                loop: for (;;) {
                     if (threadAccessException != null) {
                         threadAccessException.rethrow(this);
                     }
@@ -868,7 +868,7 @@ Object[] enterThreadChanged(boolean enterReverted, boolean pollSafepoint, boolea
                                 threadInfo = createThreadInfo(current, polyglotThreadFirstEnter);
                             } catch (PolyglotThreadAccessException ex) {
                                 threadAccessException = ex;
-                                continue LOOP;
+                                continue loop;
                             }
                             needsInitialization = true;
                         }
@@ -889,7 +889,7 @@ Object[] enterThreadChanged(boolean enterReverted, boolean pollSafepoint, boolea
                                 checkAllThreadAccesses(Thread.currentThread(), false);
                             } catch (PolyglotThreadAccessException ex) {
                                 threadAccessException = ex;
-                                continue LOOP;
+                                continue loop;
                             }
                         }
 
diff --git a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotLanguageContext.java b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotLanguageContext.java
index 650e41e74fc22..6827b57fce90d 100644
--- a/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotLanguageContext.java
+++ b/truffle/src/com.oracle.truffle.polyglot/src/com/oracle/truffle/polyglot/PolyglotLanguageContext.java
@@ -621,7 +621,7 @@ void ensureCreated(PolyglotLanguage accessingLanguage) {
             boolean wasCreated = false;
             try {
                 PolyglotThreadAccessException threadAccessException = null;
-                LOOP: for (;;) {
+                loop: for (;;) {
                     if (threadAccessException != null) {
                         threadAccessException.rethrow(context);
                     }
@@ -648,7 +648,7 @@ void ensureCreated(PolyglotLanguage accessingLanguage) {
                                 checkThreadAccess(localEnv);
                             } catch (PolyglotThreadAccessException ex) {
                                 threadAccessException = ex;
-                                continue LOOP;
+                                continue loop;
                             }
 
                             // no more errors after this line
@@ -688,7 +688,7 @@ void ensureCreated(PolyglotLanguage accessingLanguage) {
                             created = true;
                         }
                     }
-                    break LOOP;
+                    break loop;
                 }
             } finally {
                 if (!wasCreated && eventsEnabled) {