diff --git a/diylc/diylc-library/lib/diylc-core.jar b/diylc/diylc-library/lib/diylc-core.jar
index 579f2162..3e6598f1 100644
Binary files a/diylc/diylc-library/lib/diylc-core.jar and b/diylc/diylc-library/lib/diylc-core.jar differ
diff --git a/diylc/diylc-library/src/org/diylc/components/misc/BatterySymbol.java b/diylc/diylc-library/src/org/diylc/components/misc/BatterySymbol.java
index 0e761415..513ece53 100644
--- a/diylc/diylc-library/src/org/diylc/components/misc/BatterySymbol.java
+++ b/diylc/diylc-library/src/org/diylc/components/misc/BatterySymbol.java
@@ -13,7 +13,7 @@ import org.diylc.core.measures.Size;
 import org.diylc.core.measures.SizeUnit;
 import org.diylc.core.measures.VoltageUnit;
 
-@ComponentDescriptor(name = "Battery (schematic symbol)", author = "N9XYP", category = "Schematics",
+@ComponentDescriptor(name = "Battery (symbol)", author = "N9XYP", category = "Schematics",
     creationMethod = CreationMethod.POINT_BY_POINT, instanceNamePrefix = "B", description = "Battery schematic symbol",
     zOrder = IDIYComponent.COMPONENT)
 public class BatterySymbol extends AbstractSchematicLeadedSymbol<String> {
diff --git a/diylc/diylc-library/src/org/diylc/components/misc/GroundSymbol.java b/diylc/diylc-library/src/org/diylc/components/misc/GroundSymbol.java
index 461e2b3c..03da36a1 100644
--- a/diylc/diylc-library/src/org/diylc/components/misc/GroundSymbol.java
+++ b/diylc/diylc-library/src/org/diylc/components/misc/GroundSymbol.java
@@ -18,7 +18,7 @@ import org.diylc.core.annotations.EditableProperty;
 import org.diylc.core.measures.Size;
 import org.diylc.core.measures.SizeUnit;
 
-@ComponentDescriptor(name = "Ground Symbol", author = "Branislav Stojkovic", category = "Schematics",
+@ComponentDescriptor(name = "Ground (symbol)", author = "Branislav Stojkovic", category = "Schematics",
     instanceNamePrefix = "GND", description = "Ground schematic symbol", stretchable = false,
     zOrder = IDIYComponent.COMPONENT, bomPolicy = BomPolicy.NEVER_SHOW, autoEdit = false)
 public class GroundSymbol extends AbstractComponent<Void> {
diff --git a/diylc/diylc-library/src/org/diylc/components/passive/CapacitorSymbol.java b/diylc/diylc-library/src/org/diylc/components/passive/CapacitorSymbol.java
index 95f8ac32..a8e3d31d 100644
--- a/diylc/diylc-library/src/org/diylc/components/passive/CapacitorSymbol.java
+++ b/diylc/diylc-library/src/org/diylc/components/passive/CapacitorSymbol.java
@@ -15,7 +15,7 @@ import org.diylc.core.measures.Capacitance;
 import org.diylc.core.measures.Size;
 import org.diylc.core.measures.SizeUnit;
 
-@ComponentDescriptor(name = "Capacitor (schematic symbol)", author = "Branislav Stojkovic", category = "Schematics",
+@ComponentDescriptor(name = "Capacitor (symbol)", author = "Branislav Stojkovic", category = "Schematics",
     creationMethod = CreationMethod.POINT_BY_POINT, instanceNamePrefix = "C",
     description = "Capacitor schematic symbol with an optional polarity sign", zOrder = IDIYComponent.COMPONENT,
     keywordPolicy = KeywordPolicy.SHOW_TAG, keywordTag = "Schematic")
diff --git a/diylc/diylc-library/src/org/diylc/components/passive/InductorSymbol.java b/diylc/diylc-library/src/org/diylc/components/passive/InductorSymbol.java
index 8078a226..783f59f6 100644
--- a/diylc/diylc-library/src/org/diylc/components/passive/InductorSymbol.java
+++ b/diylc/diylc-library/src/org/diylc/components/passive/InductorSymbol.java
@@ -17,7 +17,7 @@ import org.diylc.core.measures.Resistance;
 import org.diylc.core.measures.Size;
 import org.diylc.core.measures.SizeUnit;
 
-@ComponentDescriptor(name = "Inductor (schematic symbol)", author = "Branislav Stojkovic", category = "Schematics",
+@ComponentDescriptor(name = "Inductor (symbol)", author = "Branislav Stojkovic", category = "Schematics",
     creationMethod = CreationMethod.POINT_BY_POINT, instanceNamePrefix = "L",
     description = "Inductor schematic symbol", zOrder = IDIYComponent.COMPONENT,
         keywordPolicy = KeywordPolicy.SHOW_TAG, keywordTag = "Schematic")
diff --git a/diylc/diylc-library/src/org/diylc/components/passive/PotentiometerSymbol.java b/diylc/diylc-library/src/org/diylc/components/passive/PotentiometerSymbol.java
index db4ec9f6..058931a2 100644
--- a/diylc/diylc-library/src/org/diylc/components/passive/PotentiometerSymbol.java
+++ b/diylc/diylc-library/src/org/diylc/components/passive/PotentiometerSymbol.java
@@ -14,7 +14,7 @@ import org.diylc.core.annotations.KeywordPolicy;
 import org.diylc.components.Abstract3LegSymbol;
 import org.diylc.components.semiconductors.SymbolFlipping;
 
-@ComponentDescriptor(name = "Potentiometer Symbol", author = "MCbx", category = "Schematics",
+@ComponentDescriptor(name = "Potentiometer (symbol)", author = "MCbx", category = "Schematics",
     instanceNamePrefix = "VR", description = "Potentiometer symbol", stretchable = false,
     zOrder = IDIYComponent.COMPONENT, rotatable = true, keywordPolicy = KeywordPolicy.SHOW_TAG,
     keywordTag = "Schematic")
diff --git a/diylc/diylc-library/src/org/diylc/components/passive/RadialElectrolytic.java b/diylc/diylc-library/src/org/diylc/components/passive/RadialElectrolytic.java
index 64a6ca62..6d357f7d 100644
--- a/diylc/diylc-library/src/org/diylc/components/passive/RadialElectrolytic.java
+++ b/diylc/diylc-library/src/org/diylc/components/passive/RadialElectrolytic.java
@@ -23,7 +23,7 @@ import org.diylc.core.measures.Size;
 import org.diylc.core.measures.SizeUnit;
 import org.diylc.utils.Constants;
 
-@ComponentDescriptor(name = "Electrolytic Capacitor", author = "Branislav Stojkovic", category = "Passive",
+@ComponentDescriptor(name = "Electrolytic Capacitor (radial)", author = "Branislav Stojkovic", category = "Passive",
     creationMethod = CreationMethod.POINT_BY_POINT, instanceNamePrefix = "C",
     description = "Vertical mounted electrolytic capacitor, polarized or bipolar", zOrder = IDIYComponent.COMPONENT)
 public class RadialElectrolytic extends AbstractRadialComponent<Capacitance> {
diff --git a/diylc/diylc-library/src/org/diylc/components/passive/ResistorSymbol.java b/diylc/diylc-library/src/org/diylc/components/passive/ResistorSymbol.java
index f0ebcfb9..47b23bb2 100644
--- a/diylc/diylc-library/src/org/diylc/components/passive/ResistorSymbol.java
+++ b/diylc/diylc-library/src/org/diylc/components/passive/ResistorSymbol.java
@@ -15,7 +15,7 @@ import org.diylc.core.measures.Resistance;
 import org.diylc.core.measures.Size;
 import org.diylc.core.measures.SizeUnit;
 
-@ComponentDescriptor(name = "Resistor (schematic symbol)", author = "Branislav Stojkovic", category = "Schematics",
+@ComponentDescriptor(name = "Resistor (symbol)", author = "Branislav Stojkovic", category = "Schematics",
     creationMethod = CreationMethod.POINT_BY_POINT, instanceNamePrefix = "R",
     description = "Resistor schematic symbol", zOrder = IDIYComponent.COMPONENT,
     keywordPolicy = KeywordPolicy.SHOW_TAG, keywordTag = "Schematic")
diff --git a/diylc/diylc-library/src/org/diylc/components/passive/TransformerCoil.java b/diylc/diylc-library/src/org/diylc/components/passive/TransformerCoil.java
index fcd6309c..69e28e3a 100644
--- a/diylc/diylc-library/src/org/diylc/components/passive/TransformerCoil.java
+++ b/diylc/diylc-library/src/org/diylc/components/passive/TransformerCoil.java
@@ -25,7 +25,7 @@ import org.diylc.core.measures.SizeUnit;
 import org.diylc.utils.Constants;
 
 @ComponentDescriptor(
-    name = "Transformer Coil Symbol",
+    name = "Transformer Coil (symbol)",
     author = "Branislav Stojkovic",
     category = "Schematics",
     instanceNamePrefix = "L",
diff --git a/diylc/diylc-library/src/org/diylc/components/passive/TransformerCore.java b/diylc/diylc-library/src/org/diylc/components/passive/TransformerCore.java
index 9b331f13..5fa1d91f 100644
--- a/diylc/diylc-library/src/org/diylc/components/passive/TransformerCore.java
+++ b/diylc/diylc-library/src/org/diylc/components/passive/TransformerCore.java
@@ -24,7 +24,7 @@ import org.diylc.core.measures.SizeUnit;
 import org.diylc.utils.Constants;
 
 @ComponentDescriptor(
-    name = "Transformer Core Symbol",
+    name = "Transformer Core (symbol)",
     author = "Branislav Stojkovic",
     category = "Schematics",
     instanceNamePrefix = "T",
diff --git a/diylc/diylc-library/src/org/diylc/components/semiconductors/BJTSymbol.java b/diylc/diylc-library/src/org/diylc/components/semiconductors/BJTSymbol.java
index 72d92fda..eca078ec 100644
--- a/diylc/diylc-library/src/org/diylc/components/semiconductors/BJTSymbol.java
+++ b/diylc/diylc-library/src/org/diylc/components/semiconductors/BJTSymbol.java
@@ -14,7 +14,7 @@ import org.diylc.core.annotations.ComponentDescriptor;
 import org.diylc.core.annotations.EditableProperty;
 import org.diylc.core.annotations.KeywordPolicy;
 
-@ComponentDescriptor(name = "BJT Symbol", author = "Branislav Stojkovic", category = "Schematics",
+@ComponentDescriptor(name = "BJT (symbol)", author = "Branislav Stojkovic", category = "Schematics",
     instanceNamePrefix = "Q", description = "Bipolar junction transistor schematic symbol", stretchable = false,
     zOrder = IDIYComponent.COMPONENT, rotatable = true, keywordPolicy = KeywordPolicy.SHOW_TAG_AND_VALUE,
     keywordTag = "Schematic")
diff --git a/diylc/diylc-library/src/org/diylc/components/semiconductors/DiodeSymbol.java b/diylc/diylc-library/src/org/diylc/components/semiconductors/DiodeSymbol.java
index 1af857fa..e87bb0f6 100644
--- a/diylc/diylc-library/src/org/diylc/components/semiconductors/DiodeSymbol.java
+++ b/diylc/diylc-library/src/org/diylc/components/semiconductors/DiodeSymbol.java
@@ -11,7 +11,7 @@ import org.diylc.core.annotations.KeywordPolicy;
 import org.diylc.core.measures.Size;
 import org.diylc.core.measures.SizeUnit;
 
-@ComponentDescriptor(name = "Diode (schematic symbol)", author = "Branislav Stojkovic", category = "Schematics",
+@ComponentDescriptor(name = "Diode (symbol)", author = "Branislav Stojkovic", category = "Schematics",
     creationMethod = CreationMethod.POINT_BY_POINT, instanceNamePrefix = "D", description = "Diode schematic symbol",
     zOrder = IDIYComponent.COMPONENT, keywordPolicy = KeywordPolicy.SHOW_TAG, keywordTag = "Schematic")
 public class DiodeSymbol extends AbstractDiodeSymbol {
diff --git a/diylc/diylc-library/src/org/diylc/components/semiconductors/ICSymbol.java b/diylc/diylc-library/src/org/diylc/components/semiconductors/ICSymbol.java
index 696b5a9a..65ac614f 100644
--- a/diylc/diylc-library/src/org/diylc/components/semiconductors/ICSymbol.java
+++ b/diylc/diylc-library/src/org/diylc/components/semiconductors/ICSymbol.java
@@ -31,7 +31,7 @@ import org.diylc.core.measures.Size;
 import org.diylc.core.measures.SizeUnit;
 import org.diylc.utils.Constants;
 
-@ComponentDescriptor(name = "IC Symbol", author = "Branislav Stojkovic", category = "Schematics",
+@ComponentDescriptor(name = "IC (symbol)", author = "Branislav Stojkovic", category = "Schematics",
     instanceNamePrefix = "IC", description = "IC symbol with 3 or 5 contacts", stretchable = false,
     zOrder = IDIYComponent.COMPONENT, rotatable = false, keywordPolicy = KeywordPolicy.SHOW_TAG_AND_VALUE,
     keywordTag = "Schematic")
diff --git a/diylc/diylc-library/src/org/diylc/components/semiconductors/JFETSymbol.java b/diylc/diylc-library/src/org/diylc/components/semiconductors/JFETSymbol.java
index 9e52316c..6c2235ac 100644
--- a/diylc/diylc-library/src/org/diylc/components/semiconductors/JFETSymbol.java
+++ b/diylc/diylc-library/src/org/diylc/components/semiconductors/JFETSymbol.java
@@ -12,7 +12,7 @@ import org.diylc.core.annotations.ComponentDescriptor;
 import org.diylc.core.annotations.EditableProperty;
 import org.diylc.core.annotations.KeywordPolicy;
 
-@ComponentDescriptor(name = "JFET Symbol", author = "Branislav Stojkovic", category = "Schematics",
+@ComponentDescriptor(name = "JFET (symbol)", author = "Branislav Stojkovic", category = "Schematics",
     instanceNamePrefix = "Q", description = "JFET transistor schematic symbol", stretchable = false,
     zOrder = IDIYComponent.COMPONENT, rotatable = true, keywordPolicy = KeywordPolicy.SHOW_TAG_AND_VALUE,
     keywordTag = "Schematic")
diff --git a/diylc/diylc-library/src/org/diylc/components/semiconductors/LEDSymbol.java b/diylc/diylc-library/src/org/diylc/components/semiconductors/LEDSymbol.java
index d59acafd..7dc7b8f8 100644
--- a/diylc/diylc-library/src/org/diylc/components/semiconductors/LEDSymbol.java
+++ b/diylc/diylc-library/src/org/diylc/components/semiconductors/LEDSymbol.java
@@ -10,7 +10,7 @@ import org.diylc.core.IDIYComponent;
 import org.diylc.core.annotations.ComponentDescriptor;
 import org.diylc.core.annotations.KeywordPolicy;
 
-@ComponentDescriptor(name = "LED (schematic symbol)", author = "Branislav Stojkovic", category = "Schematics",
+@ComponentDescriptor(name = "LED (symbol)", author = "Branislav Stojkovic", category = "Schematics",
     creationMethod = CreationMethod.POINT_BY_POINT, instanceNamePrefix = "D", description = "Diode schematic symbol",
     zOrder = IDIYComponent.COMPONENT, keywordPolicy = KeywordPolicy.SHOW_TAG, keywordTag = "Schematic")
 public class LEDSymbol extends DiodeSymbol {
diff --git a/diylc/diylc-library/src/org/diylc/components/semiconductors/MOSFETSymbol.java b/diylc/diylc-library/src/org/diylc/components/semiconductors/MOSFETSymbol.java
index a2282e7b..d19c7b67 100644
--- a/diylc/diylc-library/src/org/diylc/components/semiconductors/MOSFETSymbol.java
+++ b/diylc/diylc-library/src/org/diylc/components/semiconductors/MOSFETSymbol.java
@@ -12,7 +12,7 @@ import org.diylc.core.annotations.ComponentDescriptor;
 import org.diylc.core.annotations.EditableProperty;
 import org.diylc.core.annotations.KeywordPolicy;
 
-@ComponentDescriptor(name = "MOSFET Symbol", author = "Branislav Stojkovic", category = "Schematics",
+@ComponentDescriptor(name = "MOSFET (symbol)", author = "Branislav Stojkovic", category = "Schematics",
     instanceNamePrefix = "Q", description = "MOSFET transistor schematic symbol", stretchable = false,
     zOrder = IDIYComponent.COMPONENT, rotatable = true, keywordPolicy = KeywordPolicy.SHOW_TAG_AND_VALUE,
     keywordTag = "Schematic")
diff --git a/diylc/diylc-library/src/org/diylc/components/semiconductors/SchottkyDiodeSymbol.java b/diylc/diylc-library/src/org/diylc/components/semiconductors/SchottkyDiodeSymbol.java
index fbbae589..52c85a39 100644
--- a/diylc/diylc-library/src/org/diylc/components/semiconductors/SchottkyDiodeSymbol.java
+++ b/diylc/diylc-library/src/org/diylc/components/semiconductors/SchottkyDiodeSymbol.java
@@ -11,7 +11,7 @@ import org.diylc.core.annotations.KeywordPolicy;
 import org.diylc.core.measures.Size;
 import org.diylc.core.measures.SizeUnit;
 
-@ComponentDescriptor(name = "Schottky diode (schematic symbol)", author = "Branislav Stojkovic",
+@ComponentDescriptor(name = "Schottky Siode (symbol)", author = "Branislav Stojkovic",
     category = "Schematics", creationMethod = CreationMethod.POINT_BY_POINT, instanceNamePrefix = "D",
     description = "Schottky diode schematic symbol", zOrder = IDIYComponent.COMPONENT,
     keywordPolicy = KeywordPolicy.SHOW_TAG, keywordTag = "Schematic")
diff --git a/diylc/diylc-library/src/org/diylc/components/semiconductors/ZenerDiodeSymbol.java b/diylc/diylc-library/src/org/diylc/components/semiconductors/ZenerDiodeSymbol.java
index fd0c044e..6fbb464c 100644
--- a/diylc/diylc-library/src/org/diylc/components/semiconductors/ZenerDiodeSymbol.java
+++ b/diylc/diylc-library/src/org/diylc/components/semiconductors/ZenerDiodeSymbol.java
@@ -11,7 +11,7 @@ import org.diylc.core.annotations.KeywordPolicy;
 import org.diylc.core.measures.Size;
 import org.diylc.core.measures.SizeUnit;
 
-@ComponentDescriptor(name = "Zener diode (schematic symbol)", author = "Branislav Stojkovic", category = "Schematics",
+@ComponentDescriptor(name = "Zener Diode (symbol)", author = "Branislav Stojkovic", category = "Schematics",
     creationMethod = CreationMethod.POINT_BY_POINT, instanceNamePrefix = "D",
     description = "Zener diode schematic symbol", zOrder = IDIYComponent.COMPONENT,
     keywordPolicy = KeywordPolicy.SHOW_TAG, keywordTag = "Schematic")
diff --git a/diylc/diylc-library/src/org/diylc/components/tube/DiodeSymbol.java b/diylc/diylc-library/src/org/diylc/components/tube/DiodeSymbol.java
index 250fb337..1d9935cd 100644
--- a/diylc/diylc-library/src/org/diylc/components/tube/DiodeSymbol.java
+++ b/diylc/diylc-library/src/org/diylc/components/tube/DiodeSymbol.java
@@ -15,7 +15,7 @@ import org.diylc.core.annotations.ComponentDescriptor;
 import org.diylc.core.annotations.EditableProperty;
 import org.diylc.core.annotations.KeywordPolicy;
 
-@ComponentDescriptor(name = "Diode Symbol", author = "Branislav Stojkovic", category = "Schematics",
+@ComponentDescriptor(name = "Diode (symbol)", author = "Branislav Stojkovic", category = "Schematics",
     instanceNamePrefix = "V", description = "Diode tube symbol", stretchable = false, zOrder = IDIYComponent.COMPONENT,
     rotatable = false, keywordPolicy = KeywordPolicy.SHOW_VALUE)
 public class DiodeSymbol extends AbstractTubeSymbol {
diff --git a/diylc/diylc-library/src/org/diylc/components/tube/PentodeSymbol.java b/diylc/diylc-library/src/org/diylc/components/tube/PentodeSymbol.java
index a38e3a8c..7c1f3ba1 100644
--- a/diylc/diylc-library/src/org/diylc/components/tube/PentodeSymbol.java
+++ b/diylc/diylc-library/src/org/diylc/components/tube/PentodeSymbol.java
@@ -14,7 +14,7 @@ import org.diylc.core.annotations.ComponentDescriptor;
 import org.diylc.core.annotations.EditableProperty;
 import org.diylc.core.annotations.KeywordPolicy;
 
-@ComponentDescriptor(name = "Pentode Symbol", author = "Branislav Stojkovic", category = "Schematics",
+@ComponentDescriptor(name = "Pentode (symbol)", author = "Branislav Stojkovic", category = "Schematics",
     instanceNamePrefix = "V", description = "Pentode tube symbol", stretchable = false,
     zOrder = IDIYComponent.COMPONENT, rotatable = false, keywordPolicy = KeywordPolicy.SHOW_VALUE)
 public class PentodeSymbol extends AbstractTubeSymbol {
diff --git a/diylc/diylc-library/src/org/diylc/components/tube/TriodeSymbol.java b/diylc/diylc-library/src/org/diylc/components/tube/TriodeSymbol.java
index effde503..90ae6749 100644
--- a/diylc/diylc-library/src/org/diylc/components/tube/TriodeSymbol.java
+++ b/diylc/diylc-library/src/org/diylc/components/tube/TriodeSymbol.java
@@ -14,7 +14,7 @@ import org.diylc.core.annotations.ComponentDescriptor;
 import org.diylc.core.annotations.EditableProperty;
 import org.diylc.core.annotations.KeywordPolicy;
 
-@ComponentDescriptor(name = "Triode Symbol", author = "Branislav Stojkovic", category = "Schematics",
+@ComponentDescriptor(name = "Triode (symbol)", author = "Branislav Stojkovic", category = "Schematics",
     instanceNamePrefix = "V", description = "Triode tube symbol", stretchable = false,
     zOrder = IDIYComponent.COMPONENT, rotatable = false, keywordPolicy = KeywordPolicy.SHOW_VALUE)
 public class TriodeSymbol extends AbstractTubeSymbol {
diff --git a/diylc/diylc-swing/lib/diylc-core.jar b/diylc/diylc-swing/lib/diylc-core.jar
index 579f2162..3e6598f1 100644
Binary files a/diylc/diylc-swing/lib/diylc-core.jar and b/diylc/diylc-swing/lib/diylc-core.jar differ
diff --git a/diylc/diylc-swing/library/main.jar b/diylc/diylc-swing/library/main.jar
index 681972b3..9a886a86 100644
Binary files a/diylc/diylc-swing/library/main.jar and b/diylc/diylc-swing/library/main.jar differ