diff --git a/core/common/src/main/java/org/onosproject/common/app/ApplicationArchive.java b/core/common/src/main/java/org/onosproject/common/app/ApplicationArchive.java
index 37cdbdf..ab03ab2 100644
--- a/core/common/src/main/java/org/onosproject/common/app/ApplicationArchive.java
+++ b/core/common/src/main/java/org/onosproject/common/app/ApplicationArchive.java
@@ -44,7 +44,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.NoSuchFileException;
 import java.util.List;
 import java.util.Locale;
@@ -213,7 +213,7 @@
 
     // Returns the substring of maximum possible length from the specified bytes.
     private String substring(byte[] bytes, int length) {
-        return new String(bytes, 0, Math.min(bytes.length, length), Charset.forName("UTF-8"));
+        return new String(bytes, 0, Math.min(bytes.length, length), StandardCharsets.UTF_8);
     }
 
     /**
diff --git a/utils/misc/src/main/java/org/onlab/packet/LLDPOrganizationalTLV.java b/utils/misc/src/main/java/org/onlab/packet/LLDPOrganizationalTLV.java
index bedf439..483b11d 100644
--- a/utils/misc/src/main/java/org/onlab/packet/LLDPOrganizationalTLV.java
+++ b/utils/misc/src/main/java/org/onlab/packet/LLDPOrganizationalTLV.java
@@ -30,7 +30,7 @@
 package org.onlab.packet;
 
 import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 
 /**
@@ -124,8 +124,7 @@
      * @return This LLDP Organizationally Specific TLV.
      */
     public LLDPOrganizationalTLV setInfoString(final String infoString) {
-        final byte[] infoStringBytes = infoString.getBytes(Charset
-                .forName("UTF-8"));
+        final byte[] infoStringBytes = infoString.getBytes(StandardCharsets.UTF_8);
         return this.setInfoString(infoStringBytes);
     }