diff --git a/pom.xml b/pom.xml
index 26167f0..cd29064 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,12 +1,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>com.loomcom.j6502</groupId>
-  <artifactId>j6502</artifactId>
+  <groupId>com.loomcom.lm6502</groupId>
+  <artifactId>lm6502</artifactId>
   <packaging>jar</packaging>
-  <version>0.1.0</version>
-  <name>j6502</name>
-  <url>http://www.loomcom.com/j6502</url>
+  <version>snapshot</version>
+  <name>lm6502</name>
+  <url>http://www.loomcom.com/lm6502</url>
   <dependencies>
     <dependency>
       <groupId>junit</groupId>
@@ -36,8 +36,8 @@
 	<configuration>
 	  <archive>
 	    <manifest>
-	      <mainClass>com.loomcom.j6502.Simulator</mainClass>
-	      <packageName>com.loomcom.j6502</packageName>
+	      <mainClass>com.loomcom.lm6502.Simulator</mainClass>
+	      <packageName>com.loomcom.lm6502</packageName>
 	    </manifest>
 	    <manifestEntries>
 	      <mode>development</mode>
diff --git a/src/main/java/com/loomcom/j6502/AddressDecoder.java b/src/main/java/com/loomcom/lm6502/AddressDecoder.java
similarity index 98%
rename from src/main/java/com/loomcom/j6502/AddressDecoder.java
rename to src/main/java/com/loomcom/lm6502/AddressDecoder.java
index 9faf9be..67634b9 100644
--- a/src/main/java/com/loomcom/j6502/AddressDecoder.java
+++ b/src/main/java/com/loomcom/lm6502/AddressDecoder.java
@@ -1,4 +1,4 @@
-package com.loomcom.j6502;
+package com.loomcom.lm6502;
 
 import java.util.Map;
 
diff --git a/src/main/java/com/loomcom/j6502/CommandParser.java b/src/main/java/com/loomcom/lm6502/CommandParser.java
similarity index 97%
rename from src/main/java/com/loomcom/j6502/CommandParser.java
rename to src/main/java/com/loomcom/lm6502/CommandParser.java
index 1c5bea3..e960055 100644
--- a/src/main/java/com/loomcom/j6502/CommandParser.java
+++ b/src/main/java/com/loomcom/lm6502/CommandParser.java
@@ -1,13 +1,13 @@
-package com.loomcom.j6502;
+package com.loomcom.lm6502;
 
 import java.io.*;
 
 public class CommandParser {
-		
+
 	private BufferedReader m_in;
 	private BufferedWriter m_out;
 	private Simulator m_simulator;
-		
+
 	public CommandParser(InputStream in, OutputStream out, Simulator s) {
 		m_in	= new BufferedReader(new InputStreamReader(in));
 		m_out = new BufferedWriter(new OutputStreamWriter(out));
@@ -28,7 +28,7 @@ public class CommandParser {
 			System.exit(1);
 		}
 	}
-		
+
 	/**
 	 * Dispatch the command.
 	 */
@@ -60,12 +60,12 @@ public class CommandParser {
 		m_out.newLine();
 		m_out.flush();
 	}
-		
+
 	/**
 	 * Returns true if the line is a quit.
 	 */
 	private boolean shouldQuit(String line) {
 		return (line == null || "q".equals(line.toLowerCase()));
 	}
-		
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/loomcom/j6502/Cpu.java b/src/main/java/com/loomcom/lm6502/Cpu.java
similarity index 97%
rename from src/main/java/com/loomcom/j6502/Cpu.java
rename to src/main/java/com/loomcom/lm6502/Cpu.java
index c44b291..b051f2d 100644
--- a/src/main/java/com/loomcom/j6502/Cpu.java
+++ b/src/main/java/com/loomcom/lm6502/Cpu.java
@@ -1,4 +1,4 @@
-package com.loomcom.j6502;
+package com.loomcom.lm6502;
 
 /**
  * Main 6502 CPU Simulation.
diff --git a/src/main/java/com/loomcom/j6502/Device.java b/src/main/java/com/loomcom/lm6502/Device.java
similarity index 95%
rename from src/main/java/com/loomcom/j6502/Device.java
rename to src/main/java/com/loomcom/lm6502/Device.java
index 867add0..4fc7cca 100644
--- a/src/main/java/com/loomcom/j6502/Device.java
+++ b/src/main/java/com/loomcom/lm6502/Device.java
@@ -1,4 +1,4 @@
- package com.loomcom.j6502;
+ package com.loomcom.lm6502;
 
 /**
  * A memory-mapped IO Device.
diff --git a/src/main/java/com/loomcom/j6502/Simulator.java b/src/main/java/com/loomcom/lm6502/Simulator.java
similarity index 96%
rename from src/main/java/com/loomcom/j6502/Simulator.java
rename to src/main/java/com/loomcom/lm6502/Simulator.java
index 36cacb4..2dde453 100644
--- a/src/main/java/com/loomcom/j6502/Simulator.java
+++ b/src/main/java/com/loomcom/lm6502/Simulator.java
@@ -1,4 +1,4 @@
-package com.loomcom.j6502;
+package com.loomcom.lm6502;
 
 import java.io.IOException;
 
diff --git a/src/test/java/com/loomcom/j6502/CpuTest.java b/src/test/java/com/loomcom/lm6502/CpuTest.java
similarity index 92%
rename from src/test/java/com/loomcom/j6502/CpuTest.java
rename to src/test/java/com/loomcom/lm6502/CpuTest.java
index 150c534..6de6af4 100644
--- a/src/test/java/com/loomcom/j6502/CpuTest.java
+++ b/src/test/java/com/loomcom/lm6502/CpuTest.java
@@ -1,7 +1,4 @@
-/**
- *
- */
-package com.loomcom.j6502;
+package com.loomcom.lm6502;
 
 import junit.framework.*;
 
diff --git a/src/test/java/com/loomcom/j6502/SimulatorTest.java b/src/test/java/com/loomcom/lm6502/SimulatorTest.java
similarity index 95%
rename from src/test/java/com/loomcom/j6502/SimulatorTest.java
rename to src/test/java/com/loomcom/lm6502/SimulatorTest.java
index fad3238..e69ede5 100644
--- a/src/test/java/com/loomcom/j6502/SimulatorTest.java
+++ b/src/test/java/com/loomcom/lm6502/SimulatorTest.java
@@ -1,4 +1,4 @@
-package com.loomcom.j6502;
+package com.loomcom.lm6502;
 
 import junit.framework.Test;
 import junit.framework.TestCase;