diff --git a/dist/ueblueprint.js b/dist/ueblueprint.js
index 3c14c9d..b664055 100755
--- a/dist/ueblueprint.js
+++ b/dist/ueblueprint.js
@@ -7168,7 +7168,7 @@ class MouseIgnore extends IMouseClickDrag {
 /** @typedef {import("lit").PropertyValues} PropertyValues */
 
 /** @extends PinTemplate<Boolean> */
-class BoolInputPinTemplate extends PinTemplate {
+class BoolPinTemplate extends PinTemplate {
 
     /** @type {HTMLInputElement?} */
     #input
@@ -7371,8 +7371,8 @@ class INumericPinTemplate extends IInputPinTemplate {
 
 /** @typedef {import("../../entity/IntegerEntity").default} IntegerEntity */
 
-/** @extends INumericInputPinTemplate<IntegerEntity> */
-class IntInputPinTemplate extends INumericPinTemplate {
+/** @extends INumericPinTemplate<IntegerEntity> */
+class IntPinTemplate extends INumericPinTemplate {
 
     setDefaultValue(values = [], rawValues = values) {
         const integer = this.element.getDefaultValue(true);
@@ -7393,7 +7393,7 @@ class IntInputPinTemplate extends INumericPinTemplate {
 
 /** @typedef {import("../../entity/IntegerEntity").default} IntegerEntity */
 
-class Int64InputPinTemplate extends IntInputPinTemplate {
+class Int64PinTemplate extends IntPinTemplate {
 
     /** @param {String[]} values */
     setInputs(values = [], updateDefaultValue = false) {
@@ -7838,7 +7838,7 @@ class ColorPickerWindowTemplate extends WindowTemplate {
  */
 
 /** @extends PinTemplate<LinearColorEntity> */
-class LinearColorInputPinTemplate extends PinTemplate {
+class LinearColorPinTemplate extends PinTemplate {
 
     /** @type {WindowElement} */
     #window
@@ -7885,7 +7885,7 @@ class LinearColorInputPinTemplate extends PinTemplate {
 
 /** @typedef {import("../../element/PinElement").default} PinElement */
 
-class NameInputPinTemplate extends IInputPinTemplate {
+class NamePinTemplate extends IInputPinTemplate {
 
     static singleLineInput = true
 }
@@ -7894,7 +7894,7 @@ class NameInputPinTemplate extends IInputPinTemplate {
  * @template {Number} T
  * @extends INumericPinTemplate<T>
  */
-class RealInputPinTemplate extends INumericPinTemplate {
+class RealPinTemplate extends INumericPinTemplate {
 
     setDefaultValue(values = [], rawValues = values) {
         this.element.setDefaultValue(values[0]);
@@ -7921,7 +7921,7 @@ class ReferencePinTemplate extends PinTemplate {
 /** @typedef {import("../../entity/RotatorEntity").default} Rotator */
 
 /** @extends INumericPinTemplate<Rotator> */
-class RotatorInputPinTemplate extends INumericPinTemplate {
+class RotatorPinTemplate extends INumericPinTemplate {
 
     #getR() {
         return IInputPinTemplate.stringFromUEToInput(Utility.minDecimals(this.element.getDefaultValue()?.R ?? 0))
@@ -7967,7 +7967,7 @@ class RotatorInputPinTemplate extends INumericPinTemplate {
 }
 
 /** @extends IInputPinTemplate<String> */
-class StringInputPinTemplate extends IInputPinTemplate {
+class StringPinTemplate extends IInputPinTemplate {
 }
 
 /** @typedef {import("../../entity/LinearColorEntity").default} LinearColorEntity */
@@ -8085,18 +8085,18 @@ class VectorPinTemplate extends INumericPinTemplate {
 class PinElement extends IElement {
 
     static #inputPinTemplates = {
-        "/Script/CoreUObject.LinearColor": LinearColorInputPinTemplate,
-        "/Script/CoreUObject.Rotator": RotatorInputPinTemplate,
+        "/Script/CoreUObject.LinearColor": LinearColorPinTemplate,
+        "/Script/CoreUObject.Rotator": RotatorPinTemplate,
         "/Script/CoreUObject.Vector": VectorPinTemplate,
         "/Script/CoreUObject.Vector2D": VectorInputPinTemplate,
-        "bool": BoolInputPinTemplate,
-        "byte": IntInputPinTemplate,
-        "int": IntInputPinTemplate,
-        "int64": Int64InputPinTemplate,
+        "bool": BoolPinTemplate,
+        "byte": IntPinTemplate,
+        "int": IntPinTemplate,
+        "int64": Int64PinTemplate,
         "MUTABLE_REFERENCE": ReferencePinTemplate,
-        "name": NameInputPinTemplate,
-        "real": RealInputPinTemplate,
-        "string": StringInputPinTemplate,
+        "name": NamePinTemplate,
+        "real": RealPinTemplate,
+        "string": StringPinTemplate,
     }
 
     static properties = {
diff --git a/js/element/PinElement.js b/js/element/PinElement.js
index 5e8fecb..93dd4e1 100644
--- a/js/element/PinElement.js
+++ b/js/element/PinElement.js
@@ -9,13 +9,13 @@ import IntPinTemplate from "../template/pin/IntPinTemplate"
 import ISerializer from "../serialization/ISerializer"
 import LinearColorEntity from "../entity/LinearColorEntity"
 import LinearColorPinTemplate from "../template/pin/LinearColorPinTemplate"
-import NameInputPinTemplate from "../template/pin/NamePinTemplate"
+import NamePinTemplate from "../template/pin/NamePinTemplate"
 import PinEntity from "../entity/PinEntity"
 import PinTemplate from "../template/pin/PinTemplate"
-import RealPinTemplate from "../template/pin/RealInputPinTemplate"
+import RealPinTemplate from "../template/pin/RealPinTemplate"
 import ReferencePinTemplate from "../template/pin/ReferencePinTemplate"
-import RotatorPinTemplate from "../template/pin/RotatorInputPinTemplate"
-import StringPinTemplate from "../template/pin/StringInputPinTemplate"
+import RotatorPinTemplate from "../template/pin/RotatorPinTemplate"
+import StringPinTemplate from "../template/pin/StringPinTemplate"
 import Utility from "../Utility"
 import Vector2DPinTemplate from "../template/pin/Vector2DPinTemplate"
 import VectorPinTemplate from "../template/pin/VectorPinTemplate"
@@ -45,7 +45,7 @@ export default class PinElement extends IElement {
         "int": IntPinTemplate,
         "int64": Int64PinTemplate,
         "MUTABLE_REFERENCE": ReferencePinTemplate,
-        "name": NameInputPinTemplate,
+        "name": NamePinTemplate,
         "real": RealPinTemplate,
         "string": StringPinTemplate,
     }
diff --git a/js/template/pin/INumericInputPinTemplate.js b/js/template/pin/INumericPinTemplate.js
similarity index 100%
rename from js/template/pin/INumericInputPinTemplate.js
rename to js/template/pin/INumericPinTemplate.js
diff --git a/js/template/pin/Int64PinTemplate.js b/js/template/pin/Int64PinTemplate.js
index f701d77..04bd3a0 100644
--- a/js/template/pin/Int64PinTemplate.js
+++ b/js/template/pin/Int64PinTemplate.js
@@ -1,6 +1,4 @@
-import { html } from "lit"
 import IntPinTemplate from "./IntPinTemplate"
-import INumericInputPinTemplate from "./INumericInputPinTemplate"
 
 /** @typedef {import("../../entity/IntegerEntity").default} IntegerEntity */
 
diff --git a/js/template/pin/IntPinTemplate.js b/js/template/pin/IntPinTemplate.js
index a222b13..02b5839 100644
--- a/js/template/pin/IntPinTemplate.js
+++ b/js/template/pin/IntPinTemplate.js
@@ -1,10 +1,10 @@
 import { html } from "lit"
-import INumericInputPinTemplate from "./INumericInputPinTemplate"
+import INumericPinTemplate from "./INumericPinTemplate"
 
 /** @typedef {import("../../entity/IntegerEntity").default} IntegerEntity */
 
-/** @extends INumericInputPinTemplate<IntegerEntity> */
-export default class IntPinTemplate extends INumericInputPinTemplate {
+/** @extends INumericPinTemplate<IntegerEntity> */
+export default class IntPinTemplate extends INumericPinTemplate {
 
     setDefaultValue(values = [], rawValues = values) {
         const integer = this.element.getDefaultValue(true)
diff --git a/js/template/pin/NamePinTemplate.js b/js/template/pin/NamePinTemplate.js
index e613f03..a9f3af6 100644
--- a/js/template/pin/NamePinTemplate.js
+++ b/js/template/pin/NamePinTemplate.js
@@ -2,7 +2,7 @@ import IInputPinTemplate from "./IInputPinTemplate"
 
 /** @typedef {import("../../element/PinElement").default} PinElement */
 
-export default class NameInputPinTemplate extends IInputPinTemplate {
+export default class NamePinTemplate extends IInputPinTemplate {
 
     static singleLineInput = true
 }
diff --git a/js/template/pin/RealInputPinTemplate.js b/js/template/pin/RealPinTemplate.js
similarity index 91%
rename from js/template/pin/RealInputPinTemplate.js
rename to js/template/pin/RealPinTemplate.js
index 2953163..7dfc64e 100644
--- a/js/template/pin/RealInputPinTemplate.js
+++ b/js/template/pin/RealPinTemplate.js
@@ -1,6 +1,6 @@
 import { html } from "lit"
 import IInputPinTemplate from "./IInputPinTemplate"
-import INumericPinTemplate from "./INumericInputPinTemplate"
+import INumericPinTemplate from "./INumericPinTemplate"
 import Utility from "../../Utility"
 
 /**
diff --git a/js/template/pin/RotatorInputPinTemplate.js b/js/template/pin/RotatorPinTemplate.js
similarity index 97%
rename from js/template/pin/RotatorInputPinTemplate.js
rename to js/template/pin/RotatorPinTemplate.js
index aadb84d..b2c7aa2 100644
--- a/js/template/pin/RotatorInputPinTemplate.js
+++ b/js/template/pin/RotatorPinTemplate.js
@@ -1,6 +1,6 @@
 import { html } from "lit"
 import IInputPinTemplate from "./IInputPinTemplate"
-import INumericPinTemplate from "./INumericInputPinTemplate"
+import INumericPinTemplate from "./INumericPinTemplate"
 import RotatorEntity from "../../entity/RotatorEntity"
 import Utility from "../../Utility"
 
diff --git a/js/template/pin/StringInputPinTemplate.js b/js/template/pin/StringPinTemplate.js
similarity index 100%
rename from js/template/pin/StringInputPinTemplate.js
rename to js/template/pin/StringPinTemplate.js
diff --git a/js/template/pin/Vector2DPinTemplate.js b/js/template/pin/Vector2DPinTemplate.js
index 0d79a27..503c9a9 100644
--- a/js/template/pin/Vector2DPinTemplate.js
+++ b/js/template/pin/Vector2DPinTemplate.js
@@ -1,6 +1,6 @@
 import { html } from "lit"
 import IInputPinTemplate from "./IInputPinTemplate"
-import INumericPinTemplate from "./INumericInputPinTemplate"
+import INumericPinTemplate from "./INumericPinTemplate"
 import Utility from "../../Utility"
 import Vector2DEntity from "../../entity/Vector2DEntity"
 
diff --git a/js/template/pin/VectorPinTemplate.js b/js/template/pin/VectorPinTemplate.js
index 3ea0593..dee3a42 100644
--- a/js/template/pin/VectorPinTemplate.js
+++ b/js/template/pin/VectorPinTemplate.js
@@ -1,6 +1,6 @@
 import { html } from "lit"
 import IInputPinTemplate from "./IInputPinTemplate"
-import INumericPinTemplate from "./INumericInputPinTemplate"
+import INumericPinTemplate from "./INumericPinTemplate"
 import Utility from "../../Utility"
 import VectorEntity from "../../entity/VectorEntity"