diff --git a/simulator/model/mod.rs b/simulator/model/mod.rs
index dac1ec5cb..cdebd76fe 100644
--- a/simulator/model/mod.rs
+++ b/simulator/model/mod.rs
@@ -579,10 +579,24 @@ impl Shadow for AlterTable {
             AlterTableType::AlterColumn { old, new } => {
                 let col = table.columns.iter_mut().find(|c| c.name == *old).unwrap();
                 *col = new.clone();
+                table.indexes.iter_mut().for_each(|index| {
+                    index.columns.iter_mut().for_each(|(col_name, _)| {
+                        if col_name == old {
+                            *col_name = new.name.clone();
+                        }
+                    });
+                });
             }
             AlterTableType::RenameColumn { old, new } => {
                 let col = table.columns.iter_mut().find(|c| c.name == *old).unwrap();
                 col.name = new.clone();
+                table.indexes.iter_mut().for_each(|index| {
+                    index.columns.iter_mut().for_each(|(col_name, _)| {
+                        if col_name == old {
+                            *col_name = new.clone();
+                        }
+                    });
+                });
             }
             AlterTableType::DropColumn { column_name } => {
                 let col_idx = table