diff --git a/src/commands/view/CanvasClear.ts b/src/commands/view/CanvasClear.ts
index 7293a3d37..e84aefc56 100644
--- a/src/commands/view/CanvasClear.ts
+++ b/src/commands/view/CanvasClear.ts
@@ -2,7 +2,7 @@ import { CommandObject } from './CommandAbstract';
 
 export default {
   run(ed) {
-    ed.DomComponents.clear();
-    ed.CssComposer.clear();
+    ed.Components.clear();
+    ed.Css.clear();
   },
 } as CommandObject;
diff --git a/src/css_composer/model/CssRule.ts b/src/css_composer/model/CssRule.ts
index f8f48d331..b3cce2ae1 100644
--- a/src/css_composer/model/CssRule.ts
+++ b/src/css_composer/model/CssRule.ts
@@ -268,7 +268,7 @@ export default class CssRule extends StyleableModel<CssRuleProperties> {
     const sel = this.getSelectors() as any;
     const sngl = sel.length == 1 && sel.at(0);
     const cmpId = sngl && sngl.isId() && sngl.get('name');
-    return (cmpId && this.em?.get('DomComponents').getById(cmpId)) || null;
+    return (cmpId && this.em?.Components.getById(cmpId)) || null;
   }
 
   /**