diff --git a/src/main/java/org/elasticsearch/license/plugin/core/ExpiredLicenseException.java b/src/main/java/org/elasticsearch/license/plugin/core/LicenseExpiredException.java
similarity index 75%
rename from src/main/java/org/elasticsearch/license/plugin/core/ExpiredLicenseException.java
rename to src/main/java/org/elasticsearch/license/plugin/core/LicenseExpiredException.java
index e771bc75597..c4925605fe8 100644
--- a/src/main/java/org/elasticsearch/license/plugin/core/ExpiredLicenseException.java
+++ b/src/main/java/org/elasticsearch/license/plugin/core/LicenseExpiredException.java
@@ -11,10 +11,10 @@ import org.elasticsearch.rest.RestStatus;
 /**
  * Exception to be thrown when a feature action requires a valid license
  */
-public class ExpiredLicenseException extends ElasticsearchException {
+public class LicenseExpiredException extends ElasticsearchException {
 
-    public ExpiredLicenseException(String feature) {
-        super(feature + " license has expired");
+    public LicenseExpiredException(String feature) {
+        super("license expired for feature [" + feature + "]");
     }
 
     @Override