diff --git a/Mathlib.lean b/Mathlib.lean
index 2d8152483bea0..b50d3ce6c4345 100644
--- a/Mathlib.lean
+++ b/Mathlib.lean
@@ -46,6 +46,7 @@ import Mathlib.Algebra.Category.GroupCat.Zero
 import Mathlib.Algebra.Category.GroupWithZeroCat
 import Mathlib.Algebra.Category.ModuleCat.Abelian
 import Mathlib.Algebra.Category.ModuleCat.Adjunctions
+import Mathlib.Algebra.Category.ModuleCat.Algebra
 import Mathlib.Algebra.Category.ModuleCat.Basic
 import Mathlib.Algebra.Category.ModuleCat.Biproducts
 import Mathlib.Algebra.Category.ModuleCat.Colimits
diff --git a/Mathlib/Algebra/Category/ModuleCat/Algebra.lean b/Mathlib/Algebra/Category/ModuleCat/Algebra.lean
new file mode 100644
index 0000000000000..86bef32c463d8
--- /dev/null
+++ b/Mathlib/Algebra/Category/ModuleCat/Algebra.lean
@@ -0,0 +1,76 @@
+/-
+Copyright (c) 2022 Scott Morrison. All rights reserved.
+Released under Apache 2.0 license as described in the file LICENSE.
+Authors: Scott Morrison
+
+! This file was ported from Lean 3 source module algebra.category.Module.algebra
+! leanprover-community/mathlib commit 1c775cc661988d96c477aa4ca6f7b5641a2a924b
+! Please do not edit these lines, except to modify the commit id
+! if you have ported upstream changes.
+-/
+import Mathlib.Algebra.Algebra.RestrictScalars
+import Mathlib.CategoryTheory.Linear.Basic
+import Mathlib.Algebra.Category.ModuleCat.Basic
+
+/-!
+# Additional typeclass for modules over an algebra
+
+For an object in `M : ModuleCat A`, where `A` is a `k`-algebra,
+we provide additional typeclasses on the underlying type `M`,
+namely `Module k M` and `IsScalarTower k A M`.
+These are not made into instances by default.
+
+We provide the `Linear k (ModuleCat A)` instance.
+
+## Note
+
+If you begin with a `[Module k M] [Module A M] [IsScalarTower k A M]`,
+and build a bundled module via `ModuleCat.of A M`,
+these instances will not necessarily agree with the original ones.
+
+It seems without making a parallel version `ModuleCat' k A`, for modules over a `k`-algebra `A`,
+that carries these typeclasses, this seems hard to achieve.
+(An alternative would be to always require these typeclasses, and remove the original `ModuleCat`,
+requiring users to write `ModuleCat' ℤ A` when `A` is merely a ring.)
+-/
+
+set_option linter.uppercaseLean3 false
+
+universe v u w
+
+open CategoryTheory
+
+namespace ModuleCat
+
+variable {k : Type u} [Field k]
+
+variable {A : Type w} [Ring A] [Algebra k A]
+
+/-- Type synonym for considering a module over a `k`-algebra as a `k`-module. -/
+def moduleOfAlgebraModule (M : ModuleCat.{v} A) : Module k M :=
+  RestrictScalars.module k A M
+#align Module.module_of_algebra_Module ModuleCat.moduleOfAlgebraModule
+
+attribute [scoped instance] ModuleCat.moduleOfAlgebraModule
+
+theorem isScalarTower_of_algebra_moduleCat (M : ModuleCat.{v} A) : IsScalarTower k A M :=
+  RestrictScalars.isScalarTower k A M
+#align Module.is_scalar_tower_of_algebra_Module ModuleCat.isScalarTower_of_algebra_moduleCat
+
+attribute [scoped instance] ModuleCat.isScalarTower_of_algebra_moduleCat
+
+-- We verify that the morphism spaces become `k`-modules.
+example (M N : ModuleCat.{v} A) : Module k (M ⟶ N) := LinearMap.module
+-- Porting note: used to be `by infer_instance` instead of `LinearMap.module`
+
+instance linearOverField : Linear k (ModuleCat.{v} A) where
+  --Porting note: used to be `by infer_instance` instead of `LinearMap.module`
+  homModule M N := LinearMap.module
+  smul_comp := by
+    -- Porting note: this was automatic by `aesop_cat`
+    aesop_cat_nonterminal
+    rw [LinearMap.smul_apply, LinearMap.smul_apply, LinearMap.map_smul_of_tower]
+    rfl
+#align Module.linear_over_field ModuleCat.linearOverField
+
+end ModuleCat
diff --git a/Mathlib/Algebra/Category/ModuleCat/Basic.lean b/Mathlib/Algebra/Category/ModuleCat/Basic.lean
index 6e2c0dda536c5..6c4c6a9c68440 100644
--- a/Mathlib/Algebra/Category/ModuleCat/Basic.lean
+++ b/Mathlib/Algebra/Category/ModuleCat/Basic.lean
@@ -379,7 +379,7 @@ section
 variable {S : Type u} [CommRing S]
 
 instance : Linear S (ModuleCat.{v} S) where
-  homModule X Y := LinearMap.instModuleLinearMapAddCommMonoid
+  homModule X Y := LinearMap.module
   smul_comp := by
     intros
     ext
diff --git a/Mathlib/Algebra/Module/LinearMap.lean b/Mathlib/Algebra/Module/LinearMap.lean
index b5780fa76e0a4..6d155273254c1 100644
--- a/Mathlib/Algebra/Module/LinearMap.lean
+++ b/Mathlib/Algebra/Module/LinearMap.lean
@@ -989,7 +989,7 @@ section Module
 
 variable [Semiring S] [Module S M₂] [SMulCommClass R₂ S M₂]
 
-instance : Module S (M →ₛₗ[σ₁₂] M₂)
+instance module : Module S (M →ₛₗ[σ₁₂] M₂)
     where
   add_smul _ _ _ := ext fun _ ↦ add_smul _ _ _
   zero_smul _ := ext fun _ ↦ zero_smul _ _