diff --git a/j2me.cdc.project.bdj/src/org/netbeans/modules/j2me/cdc/project/bdj/Bundle.properties b/j2me.cdc.project.bdj/src/org/netbeans/modules/j2me/cdc/project/bdj/Bundle.properties
old mode 100644
new mode 100755
--- a/j2me.cdc.project.bdj/src/org/netbeans/modules/j2me/cdc/project/bdj/Bundle.properties
+++ b/j2me.cdc.project.bdj/src/org/netbeans/modules/j2me/cdc/project/bdj/Bundle.properties
@@ -68,6 +68,6 @@
 LBL_BrowseWorkDir=&Browse...
 TITLE_BrowseDeploymentDir=Browse Deployment Directory
 
-Templates/Project/Samples/CDC_BD-J=Java ME (BD-J)
-Templates/Project/Samples/CDC_BD-J/GunBunny.zip=Gun Bunny sample
-#Templates/Project/Samples/CDC_BD-J/ImageDrop.zip=Image Drop sample
+Templates/Project/Samples/JAVA_ME=Java ME
+Templates/Project/Samples/JAVA_ME/GunBunny.zip=Gun Bunny sample (BD-J)
+#Templates/Project/Samples/JAVA_ME/ImageDrop.zip=Image Drop sample (BD-J)
diff --git a/j2me.cdc.project.bdj/src/org/netbeans/modules/j2me/cdc/project/bdj/resources/layer.xml b/j2me.cdc.project.bdj/src/org/netbeans/modules/j2me/cdc/project/bdj/resources/layer.xml
old mode 100644
new mode 100755
--- a/j2me.cdc.project.bdj/src/org/netbeans/modules/j2me/cdc/project/bdj/resources/layer.xml
+++ b/j2me.cdc.project.bdj/src/org/netbeans/modules/j2me/cdc/project/bdj/resources/layer.xml
@@ -70,10 +70,15 @@
         </folder>   
         <folder name="Project">
             <folder name="Samples">
-                <folder name="CDC_BD-J">
-                    <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.j2me.cdc.project.bdj.Bundle"/>
-                    <attr name="position" intvalue="420"/>
+<!--                #180655 Changed folder name to match changes made in Bundle 
+                            Removed position attribute and SystemFileSystem.localizingBundle;
+                            now defined in MIDP Wirless Examples (org.netbeans.modules.mobility.midpexamples) 
+                            Added position attributes to all children -->
+                <folder name="JAVA_ME">
+<!--                    <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.j2me.cdc.project.bdj.Bundle"/>-->
+<!--                    <attr name="position" intvalue="403"/>-->
                     <file name="GunBunny.zip" url="samples/GunBunny.zip">
+                        <attr name="position" intvalue="80"/>
                         <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.j2me.cdc.project.bdj.Bundle"/>
                         <attr name="instantiatingIterator" methodvalue="org.netbeans.modules.j2me.cdc.project.bdj.SamplesWizardIterator.createIterator"/>
                         <attr name="instantiatingWizardURL" urlvalue="nbresloc:/org/netbeans/modules/j2me/cdc/project/bdj/resources/samples/GunBunny.html"/>
diff --git a/j2me.cdc.project.ricoh/src/org/netbeans/modules/j2me/cdc/project/ricoh/Bundle.properties b/j2me.cdc.project.ricoh/src/org/netbeans/modules/j2me/cdc/project/ricoh/Bundle.properties
--- a/j2me.cdc.project.ricoh/src/org/netbeans/modules/j2me/cdc/project/ricoh/Bundle.properties
+++ b/j2me.cdc.project.ricoh/src/org/netbeans/modules/j2me/cdc/project/ricoh/Bundle.properties
@@ -307,14 +307,14 @@
 LBL_Deploy_sdcard=SD Card
 LBL_Deploy_httppost=HTTP Post
 
-Templates/Project/Samples/CDC_Ricoh=Java ME (Ricoh SDK/J)
-Templates/Project/Samples/CDC_Ricoh/ButtonTest.zip=Button Test Example
-Templates/Project/Samples/CDC_Ricoh/FormBrowser.zip=Form Browser Example
-Templates/Project/Samples/CDC_Ricoh/HardKey.zip=Hard Key Example
-Templates/Project/Samples/CDC_Ricoh/Puzzle15Xlet.zip=Puzzle15 Example
-Templates/Project/Samples/CDC_Ricoh/SampleLockControl.zip=Sample Lock Control Example
-Templates/Project/Samples/CDC_Ricoh/TimeSet.zip=Time Set Example
-Templates/Project/Samples/CDC_Ricoh/WidgetsDemoXlet.zip=Widgets Example
+Templates/Project/Samples/JAVA_ME=Java ME
+Templates/Project/Samples/JAVA_ME/ButtonTest.zip=Button Test Example (Ricoh SDK/J)
+Templates/Project/Samples/JAVA_ME/FormBrowser.zip=Form Browser Example (Ricoh SDK/J)
+Templates/Project/Samples/JAVA_ME/HardKey.zip=Hard Key Example (Ricoh SDK/J)
+Templates/Project/Samples/JAVA_ME/Puzzle15Xlet.zip=Puzzle15 Example (Ricoh SDK/J)
+Templates/Project/Samples/JAVA_ME/SampleLockControl.zip=Sample Lock Control Example (Ricoh SDK/J)
+Templates/Project/Samples/JAVA_ME/TimeSet.zip=Time Set Example (Ricoh SDK/J)
+Templates/Project/Samples/JAVA_ME/WidgetsDemoXlet.zip=Widgets Example (Ricoh SDK/J)
 
 ACSN_ServerConnection=
 
diff --git a/j2me.cdc.project.ricoh/src/org/netbeans/modules/j2me/cdc/project/ricoh/resources/layer.xml b/j2me.cdc.project.ricoh/src/org/netbeans/modules/j2me/cdc/project/ricoh/resources/layer.xml
old mode 100644
new mode 100755
--- a/j2me.cdc.project.ricoh/src/org/netbeans/modules/j2me/cdc/project/ricoh/resources/layer.xml
+++ b/j2me.cdc.project.ricoh/src/org/netbeans/modules/j2me/cdc/project/ricoh/resources/layer.xml
@@ -133,10 +133,15 @@
         </folder>
         <folder name="Project">
             <folder name="Samples">
-                <folder name="CDC_Ricoh">
-                    <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.j2me.cdc.project.ricoh.Bundle"/>
-                    <attr name="position" intvalue="410"/>                    
+<!--                #180655 Changed folder name to match changes in Bundle 
+                            Removed position attribute and SystemFileSystem.localizingBundle;
+                            now defined in MIDP Wirless Examples (org.netbeans.modules.mobility.midpexamples) 
+                            Added position attributes to all children -->
+                <folder name="JAVA_ME">
+<!--                    <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.j2me.cdc.project.ricoh.Bundle"/>-->
+<!--                    <attr name="position" intvalue="403"/>                    -->
                     <file name="ButtonTest.zip" url="samples/ButtonTest.zip">
+                        <attr name="position" intvalue="10"/>
                         <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.j2me.cdc.project.ricoh.Bundle"/>
                         <attr name="instantiatingIterator" methodvalue="org.netbeans.modules.j2me.cdc.project.ricoh.SamplesWizardIterator.createIterator"/>
                         <attr name="instantiatingWizardURL" urlvalue="nbresloc:/org/netbeans/modules/j2me/cdc/project/ricoh/resources/samples/ButtonTest.html"/>
@@ -147,6 +152,7 @@
                     </file>
 <!--                            
                     <file name="FormBrowser.zip" url="samples/FormBrowser.zip">
+                        <attr name="position" intvalue="20"/>
                         <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.j2me.cdc.project.ricoh.Bundle"/>
                         <attr name="instantiatingIterator" methodvalue="org.netbeans.modules.j2me.cdc.project.ricoh.SamplesWizardIterator.createIterator"/>
                         <attr name="instantiatingWizardURL" urlvalue="nbresloc:/org/netbeans/modules/j2me/cdc/project/ricoh/resources/samples/FormBrowser.html"/>
@@ -157,6 +163,7 @@
                     </file>
 -->                            
                     <file name="HardKey.zip" url="samples/HardKey.zip">
+                        <attr name="position" intvalue="30"/>
                         <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.j2me.cdc.project.ricoh.Bundle"/>
                         <attr name="instantiatingIterator" methodvalue="org.netbeans.modules.j2me.cdc.project.ricoh.SamplesWizardIterator.createIterator"/>
                         <attr name="instantiatingWizardURL" urlvalue="nbresloc:/org/netbeans/modules/j2me/cdc/project/ricoh/resources/samples/HardKey.html"/>
@@ -166,6 +173,7 @@
                         <attr name="sampletype" stringvalue="xlet"/>
                     </file>
                     <file name="Puzzle15Xlet.zip" url="samples/Puzzle15Xlet.zip">
+                        <attr name="position" intvalue="40"/>
                         <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.j2me.cdc.project.ricoh.Bundle"/>
                         <attr name="instantiatingIterator" methodvalue="org.netbeans.modules.j2me.cdc.project.ricoh.SamplesWizardIterator.createIterator"/>
                         <attr name="instantiatingWizardURL" urlvalue="nbresloc:/org/netbeans/modules/j2me/cdc/project/ricoh/resources/samples/Puzzle15Xlet.html"/>
@@ -175,6 +183,7 @@
                         <attr name="sampletype" stringvalue="xlet"/>
                     </file>
                     <file name="SampleLockControl.zip" url="samples/SampleLockControl.zip">
+                        <attr name="position" intvalue="50"/>
                         <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.j2me.cdc.project.ricoh.Bundle"/>
                         <attr name="instantiatingIterator" methodvalue="org.netbeans.modules.j2me.cdc.project.ricoh.SamplesWizardIterator.createIterator"/>
                         <attr name="instantiatingWizardURL" urlvalue="nbresloc:/org/netbeans/modules/j2me/cdc/project/ricoh/resources/samples/SampleLockControl.html"/>
@@ -184,6 +193,7 @@
                         <attr name="sampletype" stringvalue="xlet"/>
                     </file>
                     <file name="TimeSet.zip" url="samples/TimeSet.zip">
+                        <attr name="position" intvalue="60"/>
                         <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.j2me.cdc.project.ricoh.Bundle"/>
                         <attr name="instantiatingIterator" methodvalue="org.netbeans.modules.j2me.cdc.project.ricoh.SamplesWizardIterator.createIterator"/>
                         <attr name="instantiatingWizardURL" urlvalue="nbresloc:/org/netbeans/modules/j2me/cdc/project/ricoh/resources/samples/TimeSet.html"/>
@@ -194,6 +204,7 @@
                     </file>
                     <!-- We are waiting for a fix so it is disabled for now
                     <file name="WidgetsDemoXlet.zip" url="samples/WidgetsDemoXlet.zip">
+                        <attr name="position" intvalue="70"/>
                         <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.j2me.cdc.project.ricoh.Bundle"/>
                         <attr name="instantiatingIterator" methodvalue="org.netbeans.modules.j2me.cdc.project.ricoh.SamplesWizardIterator.createIterator"/>
                         <attr name="instantiatingWizardURL" urlvalue="nbresloc:/org/netbeans/modules/j2me/cdc/project/ricoh/resources/samples/WidgetsDemoXlet.html"/>
diff --git a/mobility.midpexamples/src/org/netbeans/modules/mobility/midpexamples/Bundle.properties b/mobility.midpexamples/src/org/netbeans/modules/mobility/midpexamples/Bundle.properties
--- a/mobility.midpexamples/src/org/netbeans/modules/mobility/midpexamples/Bundle.properties
+++ b/mobility.midpexamples/src/org/netbeans/modules/mobility/midpexamples/Bundle.properties
@@ -54,26 +54,27 @@
   various MIDP examples available through Examples Setup Wizard.
 
 ## xmlfs localization
-Templates/Project/Samples/J2ME_MIDP=Java ME (MIDP)
-Templates/Project/Samples/J2ME_MIDP/AdvancedMultimediaSupplements.zip=Advanced Multimedia Supplements
-Templates/Project/Samples/J2ME_MIDP/AudioSamples.zip=Audio Samples
-Templates/Project/Samples/J2ME_MIDP/BluetoothDemo.zip=Bluetooth Demo
-Templates/Project/Samples/J2ME_MIDP/CityGuide.zip=City Guide
-Templates/Project/Samples/J2ME_MIDP/CurrencyConverter.zip=Currency Converter
-Templates/Project/Samples/J2ME_MIDP/GameBuilderDemo.zip=Simple Game created with Game Builder
-Templates/Project/Samples/J2ME_MIDP/I18nDemo.zip=I18n Demo
-Templates/Project/Samples/J2ME_MIDP/JSR172Demo.zip=JSR172 Demo
-Templates/Project/Samples/J2ME_MIDP/LocalizationDemo.zip=Localization Support Example
-Templates/Project/Samples/J2ME_MIDP/MMAPIDemos.zip=MMAPI Demos
-Templates/Project/Samples/J2ME_MIDP/NetworkDemo.zip=Network Demo
-Templates/Project/Samples/J2ME_MIDP/ObexDemo.zip=Obex Demo
-Templates/Project/Samples/J2ME_MIDP/OpenGLESDemo.zip=OpenGL ES Demo
-Templates/Project/Samples/J2ME_MIDP/PDAPDemo.zip=PDAP Demo
-Templates/Project/Samples/J2ME_MIDP/PhotoAlbum.zip=Photo Album
-Templates/Project/Samples/J2ME_MIDP/SIPDemo.zip=SIP Demo
-Templates/Project/Samples/J2ME_MIDP/SunSamples-Demos.zip=Sun Samples - Demos
-Templates/Project/Samples/J2ME_MIDP/SVGContactList.zip=SVG Contact List
-Templates/Project/Samples/J2ME_MIDP/SVGDemo.zip=SVG Demo
-Templates/Project/Samples/J2ME_MIDP/UIDemo.zip=UI Demo
-Templates/Project/Samples/J2ME_MIDP/WMADemo.zip=WMA Demo
-Templates/Project/Samples/J2ME_MIDP/VDCustomComponents.zip=Visual Designer Custom Components
+Templates/Project/Samples/JAVA_ME=Java ME
+Templates/Project/Samples/JAVA_ME/AdvancedMultimediaSupplements.zip=Advanced Multimedia Supplements (MIDP)
+Templates/Project/Samples/JAVA_ME/AudioSamples.zip=Audio Samples (MIDP)
+Templates/Project/Samples/JAVA_ME/BluetoothDemo.zip=Bluetooth Demo (MIDP)
+Templates/Project/Samples/JAVA_ME/CityGuide.zip=City Guide (MIDP)
+Templates/Project/Samples/JAVA_ME/CurrencyConverter.zip=Currency Converter (MIDP)
+Templates/Project/Samples/JAVA_ME/GameBuilderDemo.zip=Simple Game created with Game Builder (MIDP)
+Templates/Project/Samples/JAVA_ME/I18nDemo.zip=I18n Demo (MIDP)
+Templates/Project/Samples/JAVA_ME/JSR172Demo.zip=JSR172 Demo (MIDP)
+Templates/Project/Samples/JAVA_ME/LocalizationDemo.zip=Localization Support Example (MIDP)
+Templates/Project/Samples/JAVA_ME/MMAPIDemos.zip=MMAPI Demos (MIDP)
+Templates/Project/Samples/JAVA_ME/NetworkDemo.zip=Network Demo (MIDP)
+Templates/Project/Samples/JAVA_ME/ObexDemo.zip=Obex Demo (MIDP)
+Templates/Project/Samples/JAVA_ME/OpenGLESDemo.zip=OpenGL ES Demo (MIDP)
+Templates/Project/Samples/JAVA_ME/PDAPDemo.zip=PDAP Demo (MIDP)
+Templates/Project/Samples/JAVA_ME/PhotoAlbum.zip=Photo Album (MIDP)
+Templates/Project/Samples/JAVA_ME/SIPDemo.zip=SIP Demo (MIDP)
+Templates/Project/Samples/JAVA_ME/SunSamples-Demos.zip=Sun Samples - Demos (MIDP)
+Templates/Project/Samples/JAVA_ME/SVGContactList.zip=SVG Contact List (MIDP)
+Templates/Project/Samples/JAVA_ME/SVGDemo.zip=SVG Demo (MIDP)
+Templates/Project/Samples/JAVA_ME/UIDemo.zip=UI Demo (MIDP)
+Templates/Project/Samples/JAVA_ME/WMADemo.zip=WMA Demo (MIDP)
+Templates/Project/Samples/JAVA_ME/VDCustomComponents.zip=Visual Designer Custom Components (MIDP)
+
diff --git a/mobility.midpexamples/src/org/netbeans/modules/mobility/midpexamples/mf-layer.xml b/mobility.midpexamples/src/org/netbeans/modules/mobility/midpexamples/mf-layer.xml
--- a/mobility.midpexamples/src/org/netbeans/modules/mobility/midpexamples/mf-layer.xml
+++ b/mobility.midpexamples/src/org/netbeans/modules/mobility/midpexamples/mf-layer.xml
@@ -47,7 +47,8 @@
     <folder name="Templates">
         <folder name="Project">
             <folder name="Samples">
-                <folder name="J2ME_MIDP">
+<!--                #180655 Changed folder name to match changes made in Bundle -->
+                <folder name="JAVA_ME">
                     <attr name="position" intvalue="403"/>
                     <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.modules.mobility.midpexamples.Bundle"/>
                     <attr name="instantiatingWizardURL" urlvalue="nbresloc:/org/netbeans/modules/mobility/midpexamples/descriptions/midp.html"/>