Index: src/java/com/sun/enterprise/deployment/annotation/handlers/WebServiceHandler.java
===================================================================
--- src/java/com/sun/enterprise/deployment/annotation/handlers/WebServiceHandler.java	(revision 2554)
+++ src/java/com/sun/enterprise/deployment/annotation/handlers/WebServiceHandler.java	(working copy)
@@ -242,6 +242,7 @@
                     + " referenced from the @WebService annotation on " + ((Class) annElem).getName() 
                     + " does not contain a @WebService annotation");                               
             }
+            portComponentName = ann.name();
             sibAnnotationOverriden = true;
             
             // SEI cannot have @BindingType
@@ -256,7 +257,11 @@
         //is the simple class name as long as the simple class name will be a 
         // unique port-component-name for this module
         if(portComponentName == null || portComponentName.length() == 0) {
-            portComponentName = implClassName;
+            if (sibAnnotationOverriden) {
+                portComponentName = ((Class) annElem).getSimpleName();
+            }else {
+                portComponentName = implClassName;
+            }
         }
         // Check if this port-component-name is unique for this module
         WebServiceEndpoint wep = wsDesc.getEndpointByName(portComponentName);