diff --git a/guilib b/guilib
index a88f97d44..8a523546b 160000
--- a/guilib
+++ b/guilib
@@ -1 +1 @@
-Subproject commit a88f97d44ef19a276d1f223adb678c1fc84bd411
+Subproject commit 8a523546b6bbb323008deca8d24f22a247430fe3
diff --git a/src/main/java/com/troblecodings/signals/guis/ContainerSignalBox.java b/src/main/java/com/troblecodings/signals/guis/ContainerSignalBox.java
index b6008a05f..b646bfc6c 100644
--- a/src/main/java/com/troblecodings/signals/guis/ContainerSignalBox.java
+++ b/src/main/java/com/troblecodings/signals/guis/ContainerSignalBox.java
@@ -56,7 +56,7 @@ public ContainerSignalBox(final GuiInfo info) {
     public void sendAllDataToRemote() {
         final SignalBoxGrid grid = tile.getSignalBoxGrid();
         final WriteBuffer buffer = new WriteBuffer();
-        buffer.putByte((byte) SignalBoxNetwork.SEND_GRID.ordinal());
+        buffer.putEnumValue(SignalBoxNetwork.SEND_GRID);
         buffer.putBlockPos(info.pos);
         grid.writeNetwork(buffer);
         final PosIdentifier identifier = new PosIdentifier(tile.getBlockPos(), info.world);
diff --git a/src/main/java/com/troblecodings/signals/guis/GuiSignalBox.java b/src/main/java/com/troblecodings/signals/guis/GuiSignalBox.java
index 6645a403b..cc4b44776 100644
--- a/src/main/java/com/troblecodings/signals/guis/GuiSignalBox.java
+++ b/src/main/java/com/troblecodings/signals/guis/GuiSignalBox.java
@@ -928,7 +928,7 @@ private void sendName(final Point point, final String name) {
         if (!allPacketsRecived)
             return;
         final WriteBuffer buffer = new WriteBuffer();
-        buffer.putByte((byte) SignalBoxNetwork.SEND_NAME.ordinal());
+        buffer.putEnumValue(SignalBoxNetwork.SEND_NAME);
         point.writeNetwork(buffer);
         buffer.putString(name);
         OpenSignalsMain.network.sendTo(info.player, buffer);
diff --git a/src/main/java/com/troblecodings/signals/guis/GuiSignalController.java b/src/main/java/com/troblecodings/signals/guis/GuiSignalController.java
index cff184cf3..329851892 100644
--- a/src/main/java/com/troblecodings/signals/guis/GuiSignalController.java
+++ b/src/main/java/com/troblecodings/signals/guis/GuiSignalController.java
@@ -245,6 +245,7 @@ private void initInternal() {
         lowerEntity.setInherits(true);
 
         final String name = I18n.get("tile." + signal.delegate.name().getPath() + ".name")
+                + "; Name: "
                 + ClientNameHandler.getClientName(new NameStateInfo(mc.level, controller.getPos()));
 
         final UILabel titlelabel = new UILabel(name);