diff --git a/src/main/java/net/onrc/onos/core/matchaction/action/CopyTtlInAction.java b/src/main/java/net/onrc/onos/core/matchaction/action/CopyTtlInAction.java
new file mode 100644
index 0000000..49109c5
--- /dev/null
+++ b/src/main/java/net/onrc/onos/core/matchaction/action/CopyTtlInAction.java
@@ -0,0 +1,8 @@
+package net.onrc.onos.core.matchaction.action;
+
+public class CopyTtlInAction implements Action {
+
+    public CopyTtlInAction() {
+    }
+
+}
diff --git a/src/main/java/net/onrc/onos/core/matchaction/action/GroupAction.java b/src/main/java/net/onrc/onos/core/matchaction/action/GroupAction.java
index ba0c866..77dd7ff 100644
--- a/src/main/java/net/onrc/onos/core/matchaction/action/GroupAction.java
+++ b/src/main/java/net/onrc/onos/core/matchaction/action/GroupAction.java
@@ -12,7 +12,7 @@
         fwdSws = new ArrayList<Dpid>();
     }
 
-    public void AddSwitch(Dpid d) {
+    public void addSwitch(Dpid d) {
         fwdSws.add(d);
     }
 
diff --git a/src/main/java/net/onrc/onos/core/matchaction/match/IpPacketMatch.java b/src/main/java/net/onrc/onos/core/matchaction/match/Ipv4PacketMatch.java
similarity index 70%
rename from src/main/java/net/onrc/onos/core/matchaction/match/IpPacketMatch.java
rename to src/main/java/net/onrc/onos/core/matchaction/match/Ipv4PacketMatch.java
index 58d7546..7182ca1 100644
--- a/src/main/java/net/onrc/onos/core/matchaction/match/IpPacketMatch.java
+++ b/src/main/java/net/onrc/onos/core/matchaction/match/Ipv4PacketMatch.java
@@ -2,11 +2,11 @@
 
 import net.onrc.onos.core.util.IPv4Net;
 
-public class IpPacketMatch implements Match {
+public class Ipv4PacketMatch implements Match {
 
     IPv4Net dstIp;
 
-    public IpPacketMatch(String ipAddressSlash) {
+    public Ipv4PacketMatch(String ipAddressSlash) {
         this.dstIp = new IPv4Net(ipAddressSlash);
     }
 
diff --git a/src/main/java/net/onrc/onos/core/matchaction/match/MplsPacketMatch.java b/src/main/java/net/onrc/onos/core/matchaction/match/MplsMatch.java
similarity index 68%
rename from src/main/java/net/onrc/onos/core/matchaction/match/MplsPacketMatch.java
rename to src/main/java/net/onrc/onos/core/matchaction/match/MplsMatch.java
index cf4e8d4..c0cf410 100644
--- a/src/main/java/net/onrc/onos/core/matchaction/match/MplsPacketMatch.java
+++ b/src/main/java/net/onrc/onos/core/matchaction/match/MplsMatch.java
@@ -1,10 +1,10 @@
 package net.onrc.onos.core.matchaction.match;
 
-public class MplsPacketMatch implements Match {
+public class MplsMatch implements Match {
 
     private final int mplsLabel;
 
-    public MplsPacketMatch(int label) {
+    public MplsMatch(int label) {
         this.mplsLabel = label;
     }