@@ -62,7 +62,7 @@ String format(ProcessRunner runner, String input) throws IOException, Interrupte
             logger.info("Using native-image at {}", execFile);
             execSignature = FileSignature.signAsSet(execFile);
             List<String> argumentsWithPathToExe =
-                    List.of(execSignature.getOnlyFile().getAbsolutePath(), "--palantir", "-");
+                    List.of(execSignature.getOnlyFile().getAbsolutePath(), "--ojf", "-");
             return runner.exec(input.getBytes(StandardCharsets.UTF_8), argumentsWithPathToExe)
                     .assertExitZero(StandardCharsets.UTF_8);
         }
 
@@ -54,7 +54,7 @@ class ConfigureJavaFormatterXmlTest {
     private static final String MISSING_CLASS_PATH = """
         <root>
             <component name="PalantirJavaFormatSettings">
-                <option name="style" value="PALANTIR"/>
+                <option name="style" value="OJF"/>
             </component>
         </root>
         """;
@@ -120,7 +120,7 @@ void configure_missingClassPath_added() {
         String expected = """
             <root>
               <component name="PalantirJavaFormatSettings">
-                <option name="style" value="PALANTIR"/>
+                <option name="style" value="OJF"/>
                 <option name="enabled" value="true"/>
                 <option name="implementationClassPath">
                   <list>
 
@@ -86,7 +86,7 @@ public final void runNativeImage(BenchmarkState state) throws InterruptedExcepti
         ProcessBuilder p = new ProcessBuilder();
         p.command(Stream.concat(
                         Stream.of(
-                                Path.of(System.getenv("NATIVE_IMAGE_CLASSPATH")).toString(), "-i", "--palantir"),
+                                Path.of(System.getenv("NATIVE_IMAGE_CLASSPATH")).toString(), "-i", "--ojf"),
                         state.filesToFormat.stream())
                 .collect(Collectors.toList()));
         Process process = p.inheritIO().start();
@@ -99,7 +99,7 @@ public final void runNativeImage(BenchmarkState state) throws InterruptedExcepti
     public final void runNestedLevel(MultiLevelStates state) throws InterruptedException, IOException {
         ProcessBuilder p = new ProcessBuilder();
         p.command(List.of(
-                Path.of(System.getenv("NATIVE_IMAGE_CLASSPATH")).toString(), "-i", "--palantir", state.fileToFormat));
+                Path.of(System.getenv("NATIVE_IMAGE_CLASSPATH")).toString(), "-i", "--ojf", state.fileToFormat));
         Process process = p.inheritIO().start();
         assertThat(process.waitFor()).isEqualTo(0);
     }
@@ -121,7 +121,7 @@ public final void runJar(BenchmarkState state) throws InterruptedException, IOEx
                                 "--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
                                 "com.palantir.javaformat.java.Main",
                                 "-i",
-                                "--palantir"),
+                                "--ojf"),
                         state.filesToFormat.stream())
                 .collect(Collectors.toList()));
         Process process = p.inheritIO().start();
 
@@ -62,7 +62,7 @@ public void closeBraces(int initialIndent) {
 
     private static final int INDENTATION_SIZE = 4;
     private final Formatter formatter = Formatter.createFormatter(
-            JavaFormatterOptions.builder().style(Style.PALANTIR).build());
+            JavaFormatterOptions.builder().style(Style.OJF).build());
     private static final CharMatcher NOT_WHITESPACE = CharMatcher.whitespace().negate();
 
     public String createIndentationString(int indentationLevel) {
 
@@ -148,7 +148,7 @@ static class State {
         private Optional<List<URI>> implementationClassPath = Optional.empty();
         private Optional<URI> nativeImageClassPath = Optional.empty();
 
-        public JavaFormatterOptions.Style style = JavaFormatterOptions.Style.PALANTIR;
+        public JavaFormatterOptions.Style style = JavaFormatterOptions.Style.OJF;
 
         public void setImplementationClassPath(@Nullable List<String> value) {
             implementationClassPath = Optional.ofNullable(value)
 
@@ -23,7 +23,7 @@
 
 /** Configuration options for the formatting style. */
 enum UiFormatterStyle {
-    PALANTIR("Default Palantir Java style", Style.PALANTIR),
+    OJF("Default Open Java Format style", Style.OJF),
     ;
 
     private final String description;
 
@@ -139,8 +139,8 @@ default List<String> toArgs() {
             }
 
             return args
-                    // Use palantir style
-                    .add("--palantir")
+                    // Use the open-java-format style
+                    .add("--ojf")
                     // Trailing "-" enables formatting stdin -> stdout
                     .add("-")
                     .build();
 
@@ -115,8 +115,8 @@ default List<String> toArgs() {
             }
 
             return args
-                    // Use palantir style
-                    .add("--palantir")
+                    // Use the open-java-format style
+                    .add("--ojf")
                     // Trailing "-" enables formatting stdin -> stdout
                     .add("-")
                     .build();
 
@@ -29,8 +29,8 @@
 public final class JavaFormatterOptions {
 
     public enum Style {
-        /** The default Palantir Java Style configuration. */
-        PALANTIR(2, 120),
+        /** The default Open Java Format Style configuration. */
+        OJF(2, 120),
 
         /** The default Google Java Style configuration. */
         GOOGLE(1, 100),
 
@@ -32,8 +32,8 @@ final class CommandLineOptions {
     private final ImmutableRangeSet<Integer> characterRanges;
     private final ImmutableList<Integer> offsets;
     private final ImmutableList<Integer> lengths;
-    private final boolean aosp;
-    private final boolean palantirStyle;
+    private final boolean aospStyle;
+    private final boolean ojfStyle;
     private final boolean version;
     private final boolean help;
     private final boolean stdin;
@@ -53,8 +53,8 @@ final class CommandLineOptions {
             ImmutableRangeSet<Integer> characterRanges,
             ImmutableList<Integer> offsets,
             ImmutableList<Integer> lengths,
-            boolean aosp,
-            boolean palantirStyle,
+            boolean aospStyle,
+            boolean ojfStyle,
             boolean version,
             boolean help,
             boolean stdin,
@@ -72,8 +72,8 @@ final class CommandLineOptions {
         this.characterRanges = characterRanges;
         this.offsets = offsets;
         this.lengths = lengths;
-        this.aosp = aosp;
-        this.palantirStyle = palantirStyle;
+        this.aospStyle = aospStyle;
+        this.ojfStyle = ojfStyle;
         this.version = version;
         this.help = help;
         this.stdin = stdin;
@@ -118,13 +118,13 @@ ImmutableList<Integer> lengths() {
     }
 
     /** Use AOSP style instead of Google Style (4-space indentation). */
-    boolean aosp() {
-        return aosp;
+    boolean aospStyle() {
+        return aospStyle;
     }
 
-    /** Use Palantir style instead of Google Style. */
-    boolean palantirStyle() {
-        return palantirStyle;
+    /** Use Open Java Format style instead of Google Style. */
+    boolean ojfStyle() {
+        return ojfStyle;
     }
 
     /** Print the version. */
@@ -197,8 +197,8 @@ static final class Builder {
         private final ImmutableList.Builder<Integer> offsets = ImmutableList.builder();
         private final ImmutableList.Builder<Integer> lengths = ImmutableList.builder();
         private boolean inPlace = false;
-        private boolean aosp = false;
-        private boolean palantirStyle = false;
+        private boolean aospStyle = false;
+        private boolean ojfStyle = false;
         private boolean version = false;
         private boolean help = false;
         private boolean stdin = false;
@@ -240,13 +240,13 @@ Builder addLength(Integer length) {
             return this;
         }
 
-        Builder aosp(boolean aosp) {
-            this.aosp = aosp;
+        Builder aospStyle(boolean aosp) {
+            this.aospStyle = aosp;
             return this;
         }
 
-        Builder palantirStyle(boolean palantirStyle) {
-            this.palantirStyle = palantirStyle;
+        Builder ojfStyle(boolean ojfStyle) {
+            this.ojfStyle = ojfStyle;
             return this;
         }
 
@@ -306,16 +306,16 @@ Builder outputReplacements(boolean outputReplacements) {
         }
 
         CommandLineOptions build() {
-            Preconditions.checkArgument(!aosp || !palantirStyle, "Cannot use both aosp and palantir style");
+            Preconditions.checkArgument(!aospStyle || !ojfStyle, "Cannot use both aosp and palantir style");
             return new CommandLineOptions(
                     files.build(),
                     inPlace,
                     lines.build(),
                     characterRanges.build(),
                     offsets.build(),
                     lengths.build(),
-                    aosp,
-                    palantirStyle,
+                    aospStyle,
+                    ojfStyle,
                     version,
                     help,
                     stdin,
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ String format(ProcessRunner runner, String input) throws IOException, Interrupte`
`62`	`62`	`logger.info("Using native-image at {}", execFile);`
`63`	`63`	`execSignature = FileSignature.signAsSet(execFile);`
`64`	`64`	`List<String> argumentsWithPathToExe =`
`65`		`- List.of(execSignature.getOnlyFile().getAbsolutePath(), "--palantir", "-");`
	`65`	`+ List.of(execSignature.getOnlyFile().getAbsolutePath(), "--ojf", "-");`
`66`	`66`	`return runner.exec(input.getBytes(StandardCharsets.UTF_8), argumentsWithPathToExe)`
`67`	`67`	`.assertExitZero(StandardCharsets.UTF_8);`
`68`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`
`24`	`24`	`/** Configuration options for the formatting style. */`
`25`	`25`	`enum UiFormatterStyle {`
`26`		`- PALANTIR("Default Palantir Java style", Style.PALANTIR),`
	`26`	`+ OJF("Default Open Java Format style", Style.OJF),`
`27`	`27`	`;`
`28`	`28`
`29`	`29`	`private final String description;`