diff --git a/java.project/src/org/netbeans/modules/java/project/Bundle.properties b/java.project/src/org/netbeans/modules/java/project/Bundle.properties
--- a/java.project/src/org/netbeans/modules/java/project/Bundle.properties
+++ b/java.project/src/org/netbeans/modules/java/project/Bundle.properties
@@ -135,6 +135,8 @@
 ERR_JavaTargetChooser_WrongPlatform=Wrong source level of the project. You will NOT be able to compile this file since it contains JDK 1.5 features. 
 ERR_JavaTargetChooser_InvalidFolder=The Package is not a folder
 
+INFO_JavaTargetChooser_ProvideName=Provide valid Java Class name.
+
 # copied from project/ui/Bundle
 MSG_fs_or_folder_does_not_exist=The target folder does not exist.
 MSG_fs_is_readonly=The target folder is read-only.
diff --git a/java.project/src/org/netbeans/modules/java/project/JavaTargetChooserPanel.java b/java.project/src/org/netbeans/modules/java/project/JavaTargetChooserPanel.java
--- a/java.project/src/org/netbeans/modules/java/project/JavaTargetChooserPanel.java
+++ b/java.project/src/org/netbeans/modules/java/project/JavaTargetChooserPanel.java
@@ -114,7 +114,7 @@
     }
 
     public boolean isValid() {              
-        if (gui == null || gui.getTargetName() == null) {
+        if (gui == null) {
            setErrorMessage( null );
            return false;
         }        
@@ -140,7 +140,11 @@
             }
         }
         else {
-            if ( !isValidTypeIdentifier( gui.getTargetName() ) ) {
+            if (gui.getTargetName() == null) {
+                setInfoMessage("INFO_JavaTargetChooser_ProvideName");
+                return false;
+            } 
+            else if ( !isValidTypeIdentifier( gui.getTargetName() ) ) {
                 setErrorMessage( "ERR_JavaTargetChooser_InvalidClass" );
                 return false;
             }
@@ -166,7 +170,7 @@
         }
         String errorMessage = canUseFileName (rootFolder, gui.getPackageFileName(), gui.getTargetName(), template.getExt ());        
         if (gui != null) {
-            setLocalizedErrorMessage (errorMessage);
+            setLocalizedMessage(WizardDescriptor.PROP_ERROR_MESSAGE, errorMessage);
         }
         if (errorMessage!=null) returnValue=false;                
         
@@ -261,15 +265,22 @@
     
     private void setErrorMessage( String key ) {
         if ( key == null ) {
-            setLocalizedErrorMessage ( "" ); // NOI18N
-        }
-        else {
-            setLocalizedErrorMessage ( NbBundle.getMessage( JavaTargetChooserPanelGUI.class, key) ); // NOI18N
+            setLocalizedMessage(WizardDescriptor.PROP_ERROR_MESSAGE, null);
+        } else {
+            setLocalizedMessage(WizardDescriptor.PROP_ERROR_MESSAGE, NbBundle.getMessage(JavaTargetChooserPanelGUI.class, key));
         }
     }
     
-    private void setLocalizedErrorMessage (String message) {
-        wizard.putProperty ("WizardPanel_errorMessage", message); // NOI18N
+    private void setInfoMessage(String key) {
+        if (key == null) {
+            setLocalizedMessage(WizardDescriptor.PROP_INFO_MESSAGE, null);
+        } else {
+            setLocalizedMessage(WizardDescriptor.PROP_INFO_MESSAGE, NbBundle.getMessage(JavaTargetChooserPanelGUI.class, key));
+        }
+    }
+    
+    private void setLocalizedMessage(String msgType, String message) {
+        wizard.putProperty(msgType, message);
     }
     
     private FileObject getTargetFolderFromGUI (WizardDescriptor wd) {
diff --git a/java.project/src/org/netbeans/modules/java/project/NewJavaFileWizardIterator.java b/java.project/src/org/netbeans/modules/java/project/NewJavaFileWizardIterator.java
--- a/java.project/src/org/netbeans/modules/java/project/NewJavaFileWizardIterator.java
+++ b/java.project/src/org/netbeans/modules/java/project/NewJavaFileWizardIterator.java
@@ -173,7 +173,7 @@
         panels = createPanels( wiz );
         // Make sure list of steps is accurate.
         String[] beforeSteps = null;
-        Object prop = wiz.getProperty ("WizardPanel_contentData"); // NOI18N
+        Object prop = wiz.getProperty(WizardDescriptor.PROP_CONTENT_DATA);
         if (prop != null && prop instanceof String[]) {
             beforeSteps = (String[])prop;
         }
@@ -189,9 +189,9 @@
             if (c instanceof JComponent) { // assume Swing components
                 JComponent jc = (JComponent)c;
                 // Step #.
-                jc.putClientProperty("WizardPanel_contentSelectedIndex", new Integer(i)); // NOI18N
+                jc.putClientProperty(WizardDescriptor.PROP_CONTENT_SELECTED_INDEX, new Integer(i));
                 // Step name (actually the whole list for reference).
-                jc.putClientProperty("WizardPanel_contentData", steps); // NOI18N
+                jc.putClientProperty(WizardDescriptor.PROP_CONTENT_DATA, steps);
             }
         }
     }
diff --git a/java.project/src/org/netbeans/spi/java/project/support/ui/MakeSharableVisualPanel1.java b/java.project/src/org/netbeans/spi/java/project/support/ui/MakeSharableVisualPanel1.java
--- a/java.project/src/org/netbeans/spi/java/project/support/ui/MakeSharableVisualPanel1.java
+++ b/java.project/src/org/netbeans/spi/java/project/support/ui/MakeSharableVisualPanel1.java
@@ -90,20 +90,20 @@
         String location = getLibraryLocation();
         boolean wrong = false;
         if (new File(location).isAbsolute()) {
-            settings.putProperty("WizardPanel_errorMessage", // NOI18N
+            settings.putProperty(WizardDescriptor.PROP_ERROR_MESSAGE,
                     org.openide.util.NbBundle.getMessage(MakeSharableVisualPanel1.class, "WARN_MakeSharable.absolutePath"));
             wrong = true;
         } else {
             File projectLoc = FileUtil.toFile(helper.getProjectDirectory());
             File libLoc = PropertyUtils.resolveFile(projectLoc, location);
             if (!CollocationQuery.areCollocated(projectLoc, libLoc)) {
-                settings.putProperty("WizardPanel_errorMessage", // NOI18N
+                settings.putProperty(WizardDescriptor.PROP_ERROR_MESSAGE,
                         org.openide.util.NbBundle.getMessage(MakeSharableVisualPanel1.class, "WARN_makeSharable.relativePath"));
                 wrong = true;
             }
         }
         if (!wrong) {
-            settings.putProperty("WizardPanel_errorMessage", null);// NOI18N
+            settings.putProperty(WizardDescriptor.PROP_ERROR_MESSAGE, null);
         }
 
         return true;
diff --git a/java.project/src/org/netbeans/spi/java/project/support/ui/SharableLibrariesUtils.java b/java.project/src/org/netbeans/spi/java/project/support/ui/SharableLibrariesUtils.java
--- a/java.project/src/org/netbeans/spi/java/project/support/ui/SharableLibrariesUtils.java
+++ b/java.project/src/org/netbeans/spi/java/project/support/ui/SharableLibrariesUtils.java
@@ -287,15 +287,15 @@
             if (c instanceof JComponent) { // assume Swing components
                 JComponent jc = (JComponent) c;
                 // Sets step number of a component
-                jc.putClientProperty("WizardPanel_contentSelectedIndex", new Integer(i));
+                jc.putClientProperty(WizardDescriptor.PROP_CONTENT_SELECTED_INDEX, new Integer(i));
                 // Sets steps names for a panel
-                jc.putClientProperty("WizardPanel_contentData", steps);
+                jc.putClientProperty(WizardDescriptor.PROP_CONTENT_DATA, steps);
                 // Turn on subtitle creation on each step
-                jc.putClientProperty("WizardPanel_autoWizardStyle", Boolean.TRUE);
+                jc.putClientProperty(WizardDescriptor.PROP_AUTO_WIZARD_STYLE, Boolean.TRUE);
                 // Show steps on the left side with the image on the background
-                jc.putClientProperty("WizardPanel_contentDisplayed", Boolean.TRUE);
+                jc.putClientProperty(WizardDescriptor.PROP_CONTENT_DISPLAYED, Boolean.TRUE);
                 // Turn on numbering of all steps
-                jc.putClientProperty("WizardPanel_contentNumbered", Boolean.TRUE);
+                jc.putClientProperty(WizardDescriptor.PROP_CONTENT_NUMBERED, Boolean.TRUE);
             }
         }
         return panels;