diff --git a/app/auth/views/fido.py b/app/auth/views/fido.py
index 741573af..05201d43 100644
--- a/app/auth/views/fido.py
+++ b/app/auth/views/fido.py
@@ -12,7 +12,7 @@ from app.config import MFA_USER_ID
 from app.config import RP_ID, URL
 from app.extensions import db
 from app.log import LOG
-from app.models import User, FIDO
+from app.models import User, Fido
 
 
 class FidoTokenForm(FlaskForm):
@@ -51,7 +51,7 @@ def fido():
         challenge = session["fido_challenge"]
 
         try:
-            fido_key = FIDO.get_by(
+            fido_key = Fido.get_by(
                 uuid=user.fido_uuid, credential_id=sk_assertion["id"]
             )
             webauthn_user = webauthn.WebAuthnUser(
@@ -94,7 +94,7 @@ def fido():
 
     session["fido_challenge"] = challenge.rstrip("=")
 
-    fido_model = FIDO.filter_by(uuid=user.fido_uuid).all()
+    fido_model = Fido.filter_by(uuid=user.fido_uuid).all()
     webauthn_users = []
     for record in fido_model:
         webauthn_users.append(
diff --git a/app/dashboard/views/enter_sudo.py b/app/dashboard/views/enter_sudo.py
index aef88a6e..c2c4819e 100644
--- a/app/dashboard/views/enter_sudo.py
+++ b/app/dashboard/views/enter_sudo.py
@@ -11,6 +11,7 @@ from app.log import LOG
 
 _SUDO_GAP = 900
 
+
 class LoginForm(FlaskForm):
     password = PasswordField("Password", validators=[validators.DataRequired()])
 
diff --git a/app/dashboard/views/fido_manage.py b/app/dashboard/views/fido_manage.py
index 96bba85b..db684868 100644
--- a/app/dashboard/views/fido_manage.py
+++ b/app/dashboard/views/fido_manage.py
@@ -6,7 +6,7 @@ from wtforms import HiddenField, validators
 from app.dashboard.base import dashboard_bp
 from app.extensions import db
 from app.log import LOG
-from app.models import RecoveryCode, FIDO
+from app.models import RecoveryCode, Fido
 from app.dashboard.views.enter_sudo import sudo_required
 
 
@@ -27,20 +27,20 @@ def fido_manage():
     if fido_manage_form.validate_on_submit():
         credential_id = fido_manage_form.credential_id.data
 
-        fido_key = FIDO.get_by(uuid=current_user.fido_uuid, credential_id=credential_id)
+        fido_key = Fido.get_by(uuid=current_user.fido_uuid, credential_id=credential_id)
 
         if not fido_key:
             flash("Unknown error, redirect back to manage page", "warning")
             return redirect(url_for("dashboard.fido_manage"))
 
-        FIDO.delete(fido_key.id)
+        Fido.delete(fido_key.id)
         db.session.commit()
 
         LOG.d(f"FIDO Key ID={fido_key.id} Removed")
         flash(f"Key {fido_key.name} successfully unlinked", "success")
 
         # Disable FIDO for the user if all keys have been deleted
-        if not FIDO.filter_by(uuid=current_user.fido_uuid).all():
+        if not Fido.filter_by(uuid=current_user.fido_uuid).all():
             current_user.fido_uuid = None
             db.session.commit()
 
@@ -55,5 +55,5 @@ def fido_manage():
     return render_template(
         "dashboard/fido_manage.html",
         fido_manage_form=fido_manage_form,
-        keys=FIDO.filter_by(uuid=current_user.fido_uuid),
+        keys=Fido.filter_by(uuid=current_user.fido_uuid),
     )
diff --git a/app/dashboard/views/fido_setup.py b/app/dashboard/views/fido_setup.py
index 3b86c0c9..8e43726c 100644
--- a/app/dashboard/views/fido_setup.py
+++ b/app/dashboard/views/fido_setup.py
@@ -13,7 +13,7 @@ from app.config import RP_ID, URL
 from app.dashboard.base import dashboard_bp
 from app.extensions import db
 from app.log import LOG
-from app.models import FIDO, RecoveryCode
+from app.models import Fido, RecoveryCode
 from app.dashboard.views.enter_sudo import sudo_required
 
 
@@ -34,7 +34,7 @@ def fido_setup():
         return redirect(url_for("dashboard.index"))
 
     if current_user.fido_uuid is not None:
-        fido_model = FIDO.filter_by(uuid=current_user.fido_uuid).all()
+        fido_model = Fido.filter_by(uuid=current_user.fido_uuid).all()
     else:
         fido_model = []
 
@@ -70,7 +70,7 @@ def fido_setup():
         if current_user.fido_uuid is None:
             current_user.fido_uuid = fido_uuid
 
-        FIDO.create(
+        Fido.create(
             credential_id=str(fido_credential.credential_id, "utf-8"),
             uuid=fido_uuid,
             public_key=str(fido_credential.public_key, "utf-8"),
diff --git a/app/models.py b/app/models.py
index 47c637e9..187a007b 100644
--- a/app/models.py
+++ b/app/models.py
@@ -120,7 +120,7 @@ class AliasGeneratorEnum(EnumE):
     uuid = 2  # aliases are generated based on uuid
 
 
-class FIDO(db.Model, ModelMixin):
+class Fido(db.Model, ModelMixin):
     __tablename__ = "fido"
     credential_id = db.Column(db.String(), nullable=False, unique=True, index=True)
     uuid = db.Column(
diff --git a/server.py b/server.py
index da8a073c..d6aed844 100644
--- a/server.py
+++ b/server.py
@@ -38,7 +38,7 @@ from app.log import LOG
 from app.models import (
     Client,
     User,
-    FIDO,
+    Fido,
     ClientUser,
     Alias,
     RedirectUri,