diff --git a/CHANGELOG-2.x.md b/CHANGELOG-2.x.md
index e02e6ba90d26..c825092a1943 100644
--- a/CHANGELOG-2.x.md
+++ b/CHANGELOG-2.x.md
@@ -1,5 +1,20 @@
 # Docusaurus 2 Changelog
 
+## 2.0.0-alpha.55
+
+#### :boom: Breaking Change
+
+- `infima`
+  - The following Infima classes have been renamed for consistency:
+
+    - `page-item` → `pagination__item`
+    - `pagination-nav__link--label` → `pagination-nav__label`
+    - `pagination-nav__link--sublabel` → `pagination-nav__sublabel`
+    - `tab-item` → `tabs__item`
+    - `tab-item--active` → `tabs__item--active`
+
+    If you have swizzled components, you need to replace these class names.
+
 ## 2.0.0-alpha.54
 
 **HOTFIX for 2.0.0-alpha.53**.
diff --git a/packages/docusaurus-theme-bootstrap/src/theme/BlogListPaginator/index.js b/packages/docusaurus-theme-bootstrap/src/theme/BlogListPaginator/index.js
index a67289ddb392..a6edbf0f9f36 100644
--- a/packages/docusaurus-theme-bootstrap/src/theme/BlogListPaginator/index.js
+++ b/packages/docusaurus-theme-bootstrap/src/theme/BlogListPaginator/index.js
@@ -16,14 +16,14 @@ function BlogListPaginator(props) {
       aria-label="Blog list page navigation"
       className="my-5 col col-xl-4 offset-xl-4 col-xs-6">
       <ul className="pagination justify-content-between">
-        <li className="page-item">
+        <li className="pagination__item">
           {previousPage && (
             <Link className="page-link rounded-pill" to={previousPage}>
               Older
             </Link>
           )}
         </li>
-        <li className="page-item">
+        <li className="pagination__item">
           {nextPage && (
             <Link className="page-link rounded-pill" to={nextPage}>
               Newer
diff --git a/packages/docusaurus-theme-bootstrap/src/theme/BlogPostPaginator/index.js b/packages/docusaurus-theme-bootstrap/src/theme/BlogPostPaginator/index.js
index 845214496de6..9eeb7cf028d5 100644
--- a/packages/docusaurus-theme-bootstrap/src/theme/BlogPostPaginator/index.js
+++ b/packages/docusaurus-theme-bootstrap/src/theme/BlogPostPaginator/index.js
@@ -14,14 +14,14 @@ function BlogPostPaginator(props) {
   return (
     <nav aria-label="Blog post page navigation" className="my-5">
       <ul className="pagination justify-content-between">
-        <li className="page-item">
+        <li className="pagination__item">
           {prevItem && (
             <Link className="page-link rounded-pill" to={prevItem.permalink}>
               &laquo; {prevItem.title}
             </Link>
           )}
         </li>
-        <li className="page-item">
+        <li className="pagination__item">
           {nextItem && (
             <Link className="page-link rounded-pill" to={nextItem.permalink}>
               {nextItem.title} &raquo;
diff --git a/packages/docusaurus-theme-classic/package.json b/packages/docusaurus-theme-classic/package.json
index b5544d7a71cb..4dc3e19b3b7f 100644
--- a/packages/docusaurus-theme-classic/package.json
+++ b/packages/docusaurus-theme-classic/package.json
@@ -12,7 +12,7 @@
     "@mdx-js/react": "^1.5.8",
     "classnames": "^2.2.6",
     "clipboard": "^2.0.6",
-    "infima": "0.2.0-alpha.9",
+    "infima": "0.2.0-alpha.10",
     "parse-numeric-range": "^0.0.2",
     "prism-react-renderer": "^1.1.0",
     "prismjs": "^1.20.0",
diff --git a/packages/docusaurus-theme-classic/src/theme/BlogListPaginator/index.js b/packages/docusaurus-theme-classic/src/theme/BlogListPaginator/index.js
index 801ab7319062..0b4a9931c781 100644
--- a/packages/docusaurus-theme-classic/src/theme/BlogListPaginator/index.js
+++ b/packages/docusaurus-theme-classic/src/theme/BlogListPaginator/index.js
@@ -17,18 +17,14 @@ function BlogListPaginator(props) {
       <div className="pagination-nav__item">
         {previousPage && (
           <Link className="pagination-nav__link" to={previousPage}>
-            <h4 className="pagination-nav__link--label">
-              &laquo; Newer Entries
-            </h4>
+            <h4 className="pagination-nav__label">&laquo; Newer Entries</h4>
           </Link>
         )}
       </div>
       <div className="pagination-nav__item pagination-nav__item--next">
         {nextPage && (
           <Link className="pagination-nav__link" to={nextPage}>
-            <h4 className="pagination-nav__link--label">
-              Older Entries &raquo;
-            </h4>
+            <h4 className="pagination-nav__label">Older Entries &raquo;</h4>
           </Link>
         )}
       </div>
diff --git a/packages/docusaurus-theme-classic/src/theme/BlogPostPaginator/index.js b/packages/docusaurus-theme-classic/src/theme/BlogPostPaginator/index.js
index e55ff5477b03..42cfe279e321 100644
--- a/packages/docusaurus-theme-classic/src/theme/BlogPostPaginator/index.js
+++ b/packages/docusaurus-theme-classic/src/theme/BlogPostPaginator/index.js
@@ -16,8 +16,8 @@ function BlogPostPaginator(props) {
       <div className="pagination-nav__item">
         {prevItem && (
           <Link className="pagination-nav__link" to={prevItem.permalink}>
-            <div className="pagination-nav__link--sublabel">Previous Post</div>
-            <div className="pagination-nav__link--label">
+            <div className="pagination-nav__sublabel">Previous Post</div>
+            <div className="pagination-nav__label">
               &laquo; {prevItem.title}
             </div>
           </Link>
@@ -26,8 +26,8 @@ function BlogPostPaginator(props) {
       <div className="pagination-nav__item pagination-nav__item--next">
         {nextItem && (
           <Link className="pagination-nav__link" to={nextItem.permalink}>
-            <div className="pagination-nav__link--sublabel">Next Post</div>
-            <div className="pagination-nav__link--label">
+            <div className="pagination-nav__sublabel">Next Post</div>
+            <div className="pagination-nav__label">
               {nextItem.title} &raquo;
             </div>
           </Link>
diff --git a/packages/docusaurus-theme-classic/src/theme/DocPaginator/index.js b/packages/docusaurus-theme-classic/src/theme/DocPaginator/index.js
index aaceab81c375..ec6d92245da1 100644
--- a/packages/docusaurus-theme-classic/src/theme/DocPaginator/index.js
+++ b/packages/docusaurus-theme-classic/src/theme/DocPaginator/index.js
@@ -18,8 +18,8 @@ function DocPaginator(props) {
           <Link
             className="pagination-nav__link"
             to={metadata.previous.permalink}>
-            <div className="pagination-nav__link--sublabel">Previous</div>
-            <div className="pagination-nav__link--label">
+            <div className="pagination-nav__sublabel">Previous</div>
+            <div className="pagination-nav__label">
               &laquo; {metadata.previous.title}
             </div>
           </Link>
@@ -28,8 +28,8 @@ function DocPaginator(props) {
       <div className="pagination-nav__item pagination-nav__item--next">
         {metadata.next && (
           <Link className="pagination-nav__link" to={metadata.next.permalink}>
-            <div className="pagination-nav__link--sublabel">Next</div>
-            <div className="pagination-nav__link--label">
+            <div className="pagination-nav__sublabel">Next</div>
+            <div className="pagination-nav__label">
               {metadata.next.title} &raquo;
             </div>
           </Link>
diff --git a/packages/docusaurus-theme-classic/src/theme/Tabs/index.js b/packages/docusaurus-theme-classic/src/theme/Tabs/index.js
index 53311cf8776d..07d10a08d8c0 100644
--- a/packages/docusaurus-theme-classic/src/theme/Tabs/index.js
+++ b/packages/docusaurus-theme-classic/src/theme/Tabs/index.js
@@ -87,8 +87,8 @@ function Tabs(props) {
             role="tab"
             tabIndex="0"
             aria-selected={selectedValue === value}
-            className={classnames('tab-item', styles.tabItem, {
-              'tab-item--active': selectedValue === value,
+            className={classnames('tabs__item', styles.tabItem, {
+              'tabs__item--active': selectedValue === value,
             })}
             key={value}
             ref={(tabControl) => tabRefs.push(tabControl)}
diff --git a/yarn.lock b/yarn.lock
index 93ed45d175b6..0917122493c2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8691,10 +8691,10 @@ infer-owner@^1.0.3, infer-owner@^1.0.4:
   resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
   integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==
 
-infima@0.2.0-alpha.9:
-  version "0.2.0-alpha.9"
-  resolved "https://registry.yarnpkg.com/infima/-/infima-0.2.0-alpha.9.tgz#2eea70b1571c8f55847e3f305ebd10814d2d09cf"
-  integrity sha512-EXsGm6WhsabOangUkHyTx1qfKJdHF3Q9na/hJe387ytOkWu/phwjsA7T/C6b2KeRTdZl/DO1tFZsFc2+Qnif7A==
+infima@0.2.0-alpha.10:
+  version "0.2.0-alpha.10"
+  resolved "https://registry.yarnpkg.com/infima/-/infima-0.2.0-alpha.10.tgz#935aab3e7991fe746a942849f0e62f70c5be09e9"
+  integrity sha512-6Q+KXPhV8mve76segJpmdspV7pmRdKfK5mHllew+mjtRuQxDUivd3oaZjdIe6Y8SSCammnJqJox3orpSnc7QDQ==
 
 inflight@^1.0.4:
   version "1.0.6"