diff --git a/internal/addrs/move_endpoint.go b/internal/addrs/move_endpoint.go
index 2b44c5cd1..765b66f5e 100644
--- a/internal/addrs/move_endpoint.go
+++ b/internal/addrs/move_endpoint.go
@@ -19,7 +19,7 @@ import (
 // prompt creating a different plan than Terraform would by default.
 //
 // To obtain a full address from a MoveEndpoint you must use
-// either the package function UnifyMoveEndpoints (to get an AbsMovable) or
+// either the package function UnifyMoveEndpoints (to get an AbsMoveable) or
 // the method ConfigMoveable (to get a ConfigMoveable).
 type MoveEndpoint struct {
 	// SourceRange is the location of the physical endpoint address
@@ -27,15 +27,15 @@ type MoveEndpoint struct {
 	// configuration expresson.
 	SourceRange tfdiags.SourceRange
 
-	// Internally we (ab)use AbsMovable as the representation of our
+	// Internally we (ab)use AbsMoveable as the representation of our
 	// relative address, even though everywhere else in Terraform
-	// AbsMovable always represents a fully-absolute address.
+	// AbsMoveable always represents a fully-absolute address.
 	// In practice, due to the implementation of ParseMoveEndpoint,
 	// this is always either a ModuleInstance or an AbsResourceInstance,
 	// and we only consider the possibility of interpreting it as
 	// a AbsModuleCall or an AbsResource in UnifyMoveEndpoints.
 	// This is intentionally unexported to encapsulate this unusual
-	// meaning of AbsMovable.
+	// meaning of AbsMoveable.
 	relSubject AbsMoveable
 }
 
@@ -44,7 +44,7 @@ func (e *MoveEndpoint) ObjectKind() MoveEndpointKind {
 }
 
 func (e *MoveEndpoint) String() string {
-	// Our internal pseudo-AbsMovable representing the relative
+	// Our internal pseudo-AbsMoveable representing the relative
 	// address (either ModuleInstance or AbsResourceInstance) is
 	// a good enough proxy for the relative move endpoint address
 	// serialization.
diff --git a/internal/addrs/move_endpoint_module.go b/internal/addrs/move_endpoint_module.go
index 8bbbe83e7..e2180f25a 100644
--- a/internal/addrs/move_endpoint_module.go
+++ b/internal/addrs/move_endpoint_module.go
@@ -131,7 +131,7 @@ func (e *MoveEndpointInModule) Module() Module {
 	return e.module
 }
 
-// InModuleInstance returns an AbsMovable address which concatenates the
+// InModuleInstance returns an AbsMoveable address which concatenates the
 // given module instance address with the receiver's relative object selection
 // to produce one example of an instance that might be affected by this
 // move statement.
diff --git a/internal/addrs/move_endpoint_test.go b/internal/addrs/move_endpoint_test.go
index 6e117139b..602c7e971 100644
--- a/internal/addrs/move_endpoint_test.go
+++ b/internal/addrs/move_endpoint_test.go
@@ -12,7 +12,7 @@ import (
 func TestParseMoveEndpoint(t *testing.T) {
 	tests := []struct {
 		Input   string
-		WantRel AbsMoveable // funny intermediate subset of AbsMovable
+		WantRel AbsMoveable // funny intermediate subset of AbsMoveable
 		WantErr string
 	}{
 		{
diff --git a/internal/addrs/moveable.go b/internal/addrs/moveable.go
index a85fe72c1..dcbd8c03e 100644
--- a/internal/addrs/moveable.go
+++ b/internal/addrs/moveable.go
@@ -5,7 +5,7 @@ package addrs
 // with any other similar cross-module state refactoring statements we might
 // allow.
 //
-// Note that AbsMovable represents an absolute address relative to the root
+// Note that AbsMoveable represents an absolute address relative to the root
 // of the configuration, which is different than the direct representation
 // of these in configuration where the author gives an address relative to
 // the current module where the address is defined. The type MoveEndpoint
@@ -16,7 +16,7 @@ type AbsMoveable interface {
 	String() string
 }
 
-// The following are all of the possible AbsMovable address types:
+// The following are all of the possible AbsMoveable address types:
 var (
 	_ AbsMoveable = AbsResource{}
 	_ AbsMoveable = AbsResourceInstance{}
diff --git a/internal/refactoring/move_validate.go b/internal/refactoring/move_validate.go
index aad356cb2..2c38ba756 100644
--- a/internal/refactoring/move_validate.go
+++ b/internal/refactoring/move_validate.go
@@ -110,7 +110,7 @@ func ValidateMoves(stmts []MoveStatement, rootCfg *configs.Config, declaredInsts
 				shortNoun = "resource"
 			default:
 				// The above cases should cover all of the AbsMoveable types
-				panic("unsupported AbsMovable address type")
+				panic("unsupported AbsMoveable address type")
 			}
 
 			// It's invalid to have a move statement whose "from" address
@@ -234,7 +234,7 @@ func moveableObjectExists(addr addrs.AbsMoveable, in instances.Set) bool {
 		return in.HasResource(addr)
 	default:
 		// The above cases should cover all of the AbsMoveable types
-		panic("unsupported AbsMovable address type")
+		panic("unsupported AbsMoveable address type")
 	}
 }
 
@@ -309,7 +309,7 @@ func movableObjectDeclRange(addr addrs.AbsMoveable, cfg *configs.Config) (tfdiag
 		return tfdiags.SourceRangeFromHCL(rc.DeclRange), true
 	default:
 		// The above cases should cover all of the AbsMoveable types
-		panic("unsupported AbsMovable address type")
+		panic("unsupported AbsMoveable address type")
 	}
 }