Index: src/main/java/org/codehaus/mojo/nbm/repository/PopulateRepositoryMojo.java
===================================================================
--- src/main/java/org/codehaus/mojo/nbm/repository/PopulateRepositoryMojo.java	(revision 20471)
+++ src/main/java/org/codehaus/mojo/nbm/repository/PopulateRepositoryMojo.java	(working copy)
@@ -352,15 +352,24 @@
             if ( examinator.isNetBeansModule() || examinator.isOsgiBundle() )
             {
                 //TODO get artifact id from the module's manifest?
-                String artifact = module.getName().substring( 0, module.getName().indexOf( ".jar" ) );
-                if ( "boot".equals( artifact ) )
+                String fileArtifact = module.getName().substring( 0, module.getName().indexOf( ".jar" ) );
+                if ( "boot".equals( fileArtifact ) )
                 {
-                    artifact = "org-netbeans-bootstrap";
+                    fileArtifact = "org-netbeans-bootstrap";
                 }
-                if ( "core".equals( artifact ) )
+                if ( "core".equals( fileArtifact ) )
                 {
-                    artifact = "org-netbeans-core-startup";
+                    fileArtifact = "org-netbeans-core-startup";
                 }
+                String artifact = examinator.getModule();
+                if (artifact == null) {
+                    artifact = fileArtifact;
+                } else {
+                    artifact = artifact.replaceAll("\\.", "-");
+                }
+//                if (!fileArtifact.equals(artifact)) {
+//                    System.err.println("WARNING: file-based artifact name differs from module name: " + fileArtifact + ":"  + artifact);
+//                }
                 String version = forcedVersion == null ? examinator.getSpecVersion() : forcedVersion;
                 String group = examinator.isOsgiBundle() ? GROUP_EXTERNAL : examinator.hasPublicPackages() ? GROUP_API : GROUP_IMPL;
                 Artifact art = createArtifact( artifact, version, group );