diff --git a/src/common/graph/nodetype.ts b/src/common/graph/nodetype.ts
index c9be115a85d7305224cce040b8f6b6f328023f92..39862e69c939a4e2d5e35f8b0341ae1d148780ee 100644
--- a/src/common/graph/nodetype.ts
+++ b/src/common/graph/nodetype.ts
@@ -1,5 +1,4 @@
 import { GraphElement } from "./graphelement";
-import { Node } from "./node";
 import { Graph } from "./graph";
 
 export interface NodeTypeData {
diff --git a/src/display/components/nodefilter/filtermenu.tsx b/src/display/components/nodefilter/filtermenu.tsx
index da764d508da08760ef5ddfd178327d3f782fffdb..1b839c7b89b75c5db043e7332c9e7929ac77c574 100644
--- a/src/display/components/nodefilter/filtermenu.tsx
+++ b/src/display/components/nodefilter/filtermenu.tsx
@@ -2,10 +2,10 @@ import React, { useState } from "react";
 
 import "./filtermenu.css";
 import Label from "./label";
-import { NodeTypeData } from "../../../common/graph/graph";
+import { NodeType } from "../../../common/graph/nodetype";
 
 interface FilterMenuProps {
-    classes: Map<string, GraphObjectType>;
+    classes: Map<string, NodeType>;
     onVisibilityChange?: (visibility: Map<string, boolean>) => void;
 }
 
diff --git a/src/display/components/nodeinfo/neighbors.tsx b/src/display/components/nodeinfo/neighbors.tsx
index 3d135f5e60271669657886de0b7baf03e8d41ab3..fcef46cbd5eb6ed45e2f4bbd63ec029450b0822a 100644
--- a/src/display/components/nodeinfo/neighbors.tsx
+++ b/src/display/components/nodeinfo/neighbors.tsx
@@ -1,14 +1,15 @@
 import React from "react";
 
-import { NodeTypeData, Node } from "../../../common/graph/graph";
 import FancyScrollbar from "../fancyscrollbar";
 import Collapsible from "../collapsible";
 
 import "./neighbors.css";
+import { NodeType } from "../../../common/graph/nodetype";
+import { Node } from "../../../common/graph/node";
 
 interface NeighborsProps {
     neighbors: Node[];
-    nodeColors?: Map<string, GraphObjectType>;
+    nodeColors?: Map<string, NodeType>;
     nodeClickedCallback?: (node: Node) => void;
 }
 
@@ -22,7 +23,7 @@ interface NeighborsProps {
 function Neighbors({
     neighbors,
     nodeClickedCallback,
-    nodeColors = new Map<string, GraphObjectType>(),
+    nodeColors = new Map<string, NodeType>(),
 }: NeighborsProps) {
     const classes = [
         ...new Set<string>(neighbors.map((node) => node.type.name)),
diff --git a/src/display/components/nodeinfo/nodeinfobar.tsx b/src/display/components/nodeinfo/nodeinfobar.tsx
index f457c19ea1ef26d525ac628564d8a04da602edda..8e140ea94749a8a59cf08ef15d1fd16453d3717f 100644
--- a/src/display/components/nodeinfo/nodeinfobar.tsx
+++ b/src/display/components/nodeinfo/nodeinfobar.tsx
@@ -1,16 +1,17 @@
 import React from "react";
 
 import "./nodeinfobar.css";
-import { NodeTypeData, Node } from "../../../common/graph/graph";
 import TitleArea from "./titlearea";
 import FancyScrollbar from "../fancyscrollbar";
 import MediaArea from "./mediaarea";
 import Neighbors from "./neighbors";
+import { NodeType } from "../../../common/graph/nodetype";
+import { Node } from "../../../common/graph/node";
 
 interface InfoBarProps {
     height: number;
     node: Node;
-    nodeColors?: Map<string, GraphObjectType>;
+    nodeColors?: Map<string, NodeType>;
     onClose?: () => void;
     nodeClickedCallback?: (node: Node) => void;
 }