diff --git a/doxy/samples.mapping.txt b/doxy/samples.mapping.txt
index 13dab03b..827d4196 100644
--- a/doxy/samples.mapping.txt
+++ b/doxy/samples.mapping.txt
@@ -20,6 +20,7 @@ enc03r.cxx	ENC03RSample.java
 es08a.cxx	ES08ASample.java
 flex.cxx	FlexSample.java
 gp2y0a.cxx	GP2Y0ASample.java
+grovebutton.cxx	GroveButtonSample.java
 grovecircularled.cxx	GroveCircularLEDSample.java
 grovecollision.cxx	GroveCollisionSample.java
 groveehr.cxx	GroveEHRSample.java
@@ -28,11 +29,16 @@ groveelectromagnet.cxx	GroveElectromagnetSample.java
 groveemg.cxx	GroveEMGSample.java
 grovegprs.cxx	GroveGPRSSample.java
 grovegsr.cxx	GroveGSRSample.java
+groveled.cxx	GroveLEDSample.java
 grovelinefinder.cxx	GroveLineFinderSample.java
+grovelight.cxx	GroveLightSample.java
 groveloudness.cxx	GroveLoudnessSample.java
 grovemoisture.cxx	GroveMoistureSample.java
 groveo2.cxx	GroveO2Sample.java
+groverelay.cxx	GroveRelaySample.java
+groverotary.cxx	GroveRotarySample.java
 grovescam.cxx	GROVESCAMSample.java
+groveslide.cxx	GroveSlideSample.java
 grovespeaker.cxx	GroveSpeakerSample.java
 grovevdiv.cxx	GroveVDivSample.java
 grovewater.cxx	GroveWaterSample.java
diff --git a/examples/java/A110xSample.java b/examples/java/A110XSample.java
similarity index 98%
rename from examples/java/A110xSample.java
rename to examples/java/A110XSample.java
index cba6c811..0b813a42 100644
--- a/examples/java/A110xSample.java
+++ b/examples/java/A110XSample.java
@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class A110xSample {
+public class A110XSample {
 	static {
 		try {
 			System.loadLibrary("javaupm_a110x");
diff --git a/examples/java/Adxl345.java b/examples/java/Adxl345Sample.java
similarity index 98%
rename from examples/java/Adxl345.java
rename to examples/java/Adxl345Sample.java
index 8dfad146..d73971d8 100644
--- a/examples/java/Adxl345.java
+++ b/examples/java/Adxl345Sample.java
@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class Adxl345 {
+public class Adxl345Sample {
     static {
         try {
             System.loadLibrary("javaupm_adxl345");
diff --git a/examples/java/BuzzerSample.java b/examples/java/Buzzer_soundSample.java
similarity index 98%
rename from examples/java/BuzzerSample.java
rename to examples/java/Buzzer_soundSample.java
index 107de523..9797d2e4 100644
--- a/examples/java/BuzzerSample.java
+++ b/examples/java/Buzzer_soundSample.java
@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class BuzzerSample{
+public class Buzzer_soundSample {
 	
 	static {
 		try {
diff --git a/examples/java/Jhd1313m1Sample.java b/examples/java/Jhd1313m1_lcdSample.java
similarity index 98%
rename from examples/java/Jhd1313m1Sample.java
rename to examples/java/Jhd1313m1_lcdSample.java
index 404c0fb5..26caf406 100644
--- a/examples/java/Jhd1313m1Sample.java
+++ b/examples/java/Jhd1313m1_lcdSample.java
@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class Jhd1313m1Sample{
+public class Jhd1313m1_lcdSample{
 
 	static {
 		try {
diff --git a/examples/java/MY9221Sample.java b/examples/java/MY9221_ledbarSample.java
similarity index 98%
rename from examples/java/MY9221Sample.java
rename to examples/java/MY9221_ledbarSample.java
index 8579c48a..08a729c7 100644
--- a/examples/java/MY9221Sample.java
+++ b/examples/java/MY9221_ledbarSample.java
@@ -22,7 +22,7 @@
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-public class MY9221Sample{
+public class MY9221_ledbarSample{
 
 	static {
 		try {