diff --git a/core/src/main/java/com/google/googlejavaformat/java/javadoc/JavadocFormatter.java b/core/src/main/java/com/google/googlejavaformat/java/javadoc/JavadocFormatter.java
index 29acef7e3..21f7e29bc 100644
--- a/core/src/main/java/com/google/googlejavaformat/java/javadoc/JavadocFormatter.java
+++ b/core/src/main/java/com/google/googlejavaformat/java/javadoc/JavadocFormatter.java
@@ -24,8 +24,8 @@
 import com.google.common.collect.ImmutableList;
 import com.google.googlejavaformat.java.javadoc.JavadocLexer.LexException;
 import com.google.googlejavaformat.java.javadoc.Token.BeginJavadoc;
-import com.google.googlejavaformat.java.javadoc.Token.BlockquoteCloseTag;
-import com.google.googlejavaformat.java.javadoc.Token.BlockquoteOpenTag;
+import com.google.googlejavaformat.java.javadoc.Token.BlockQuoteCloseTag;
+import com.google.googlejavaformat.java.javadoc.Token.BlockQuoteOpenTag;
 import com.google.googlejavaformat.java.javadoc.Token.BrTag;
 import com.google.googlejavaformat.java.javadoc.Token.CodeCloseTag;
 import com.google.googlejavaformat.java.javadoc.Token.CodeOpenTag;
@@ -119,8 +119,8 @@ private static String render(List<Token> input, int blockIndent, boolean classic
         case HeaderOpenTag t -> output.writeHeaderOpen(t);
         case HeaderCloseTag t -> output.writeHeaderClose(t);
         case ParagraphOpenTag t -> output.writeParagraphOpen(standardizePToken(t));
-        case BlockquoteOpenTag t -> output.writeBlockquoteOpen(t);
-        case BlockquoteCloseTag t -> output.writeBlockquoteClose(t);
+        case BlockQuoteOpenTag t -> output.writeBlockQuoteOpen(t);
+        case BlockQuoteCloseTag t -> output.writeBlockQuoteClose(t);
         case PreOpenTag t -> output.writePreOpen(t);
         case PreCloseTag t -> output.writePreClose(t);
         case CodeOpenTag t -> output.writeCodeOpen(t);
diff --git a/core/src/main/java/com/google/googlejavaformat/java/javadoc/JavadocLexer.java b/core/src/main/java/com/google/googlejavaformat/java/javadoc/JavadocLexer.java
index 5609e7c8e..142643cfc 100644
--- a/core/src/main/java/com/google/googlejavaformat/java/javadoc/JavadocLexer.java
+++ b/core/src/main/java/com/google/googlejavaformat/java/javadoc/JavadocLexer.java
@@ -28,8 +28,8 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.PeekingIterator;
 import com.google.googlejavaformat.java.javadoc.Token.BeginJavadoc;
-import com.google.googlejavaformat.java.javadoc.Token.BlockquoteCloseTag;
-import com.google.googlejavaformat.java.javadoc.Token.BlockquoteOpenTag;
+import com.google.googlejavaformat.java.javadoc.Token.BlockQuoteCloseTag;
+import com.google.googlejavaformat.java.javadoc.Token.BlockQuoteOpenTag;
 import com.google.googlejavaformat.java.javadoc.Token.BrTag;
 import com.google.googlejavaformat.java.javadoc.Token.CodeCloseTag;
 import com.google.googlejavaformat.java.javadoc.Token.CodeOpenTag;
@@ -350,9 +350,9 @@ private Function<String, Token> consumeToken() throws LexException {
     } else if (input.tryConsumeRegex(LIST_ITEM_CLOSE_PATTERN)) {
       return ListItemCloseTag::new;
     } else if (input.tryConsumeRegex(BLOCKQUOTE_OPEN_PATTERN)) {
-      return BlockquoteOpenTag::new;
+      return BlockQuoteOpenTag::new;
     } else if (input.tryConsumeRegex(BLOCKQUOTE_CLOSE_PATTERN)) {
-      return BlockquoteCloseTag::new;
+      return BlockQuoteCloseTag::new;
     } else if (input.tryConsumeRegex(HEADER_OPEN_PATTERN)) {
       return HeaderOpenTag::new;
     } else if (input.tryConsumeRegex(HEADER_CLOSE_PATTERN)) {
diff --git a/core/src/main/java/com/google/googlejavaformat/java/javadoc/JavadocWriter.java b/core/src/main/java/com/google/googlejavaformat/java/javadoc/JavadocWriter.java
index 3c4b7135e..27cc934ea 100644
--- a/core/src/main/java/com/google/googlejavaformat/java/javadoc/JavadocWriter.java
+++ b/core/src/main/java/com/google/googlejavaformat/java/javadoc/JavadocWriter.java
@@ -23,8 +23,8 @@
 import static com.google.googlejavaformat.java.javadoc.JavadocWriter.RequestedWhitespace.NONE;
 import static com.google.googlejavaformat.java.javadoc.JavadocWriter.RequestedWhitespace.WHITESPACE;
 
-import com.google.googlejavaformat.java.javadoc.Token.BlockquoteCloseTag;
-import com.google.googlejavaformat.java.javadoc.Token.BlockquoteOpenTag;
+import com.google.googlejavaformat.java.javadoc.Token.BlockQuoteCloseTag;
+import com.google.googlejavaformat.java.javadoc.Token.BlockQuoteOpenTag;
 import com.google.googlejavaformat.java.javadoc.Token.BrTag;
 import com.google.googlejavaformat.java.javadoc.Token.CodeCloseTag;
 import com.google.googlejavaformat.java.javadoc.Token.CodeOpenTag;
@@ -257,7 +257,7 @@ void writeParagraphOpen(Token token) {
     writeToken(token);
   }
 
-  void writeBlockquoteOpen(BlockquoteOpenTag token) {
+  void writeBlockQuoteOpen(BlockQuoteOpenTag token) {
     requestBlankLine();
 
     writeToken(token);
@@ -265,7 +265,7 @@ void writeBlockquoteOpen(BlockquoteOpenTag token) {
     requestNewline();
   }
 
-  void writeBlockquoteClose(BlockquoteCloseTag token) {
+  void writeBlockQuoteClose(BlockQuoteCloseTag token) {
     requestNewline();
 
     writeToken(token);
diff --git a/core/src/main/java/com/google/googlejavaformat/java/javadoc/Token.java b/core/src/main/java/com/google/googlejavaformat/java/javadoc/Token.java
index caa35d3fa..ad7a9575e 100644
--- a/core/src/main/java/com/google/googlejavaformat/java/javadoc/Token.java
+++ b/core/src/main/java/com/google/googlejavaformat/java/javadoc/Token.java
@@ -78,9 +78,9 @@ record ParagraphOpenTag(String value) implements Token, StartOfLineToken {}
 
   record ParagraphCloseTag(String value) implements Token {}
 
-  record BlockquoteOpenTag(String value) implements Token {}
+  record BlockQuoteOpenTag(String value) implements Token {}
 
-  record BlockquoteCloseTag(String value) implements Token {}
+  record BlockQuoteCloseTag(String value) implements Token {}
 
   record PreOpenTag(String value) implements Token {}