diff --git a/config/99-ps3joy.rules b/config/99-ps3joy.rules
new file mode 100644
index 0000000000000000000000000000000000000000..6ae22c72d8cbb48d39568de5d639c40fcd658ab9
--- /dev/null
+++ b/config/99-ps3joy.rules
@@ -0,0 +1,2 @@
+SUBSYSTEMS=="input", KERNEL=="js[0-9]*", ATTRS{name}=="PLAYSTATION(R)3 Controller", SYMLINK+="input/ps3joy"
+SUBSYSTEMS=="input", KERNEL=="js[0-9]*", ATTRS{name}=="Sony PLAYSTATION(R)3 Controller", SYMLINK+="input/ps3joy"
diff --git a/config/ps3.yaml b/config/ps3.yaml
index c66e7f5515fb22fda0f6aeb609eb8974324a1af1..b7a3f57013dcde9bd878bca8af12e86f87e5199c 100644
--- a/config/ps3.yaml
+++ b/config/ps3.yaml
@@ -2,9 +2,9 @@ axis_linear: 1
 scale_linear: 0.5
 scale_linear_turbo: 2.0
 
-axis_angular: 2
+axis_angular: 3
 scale_angular: 1.0
 
-enable_button: 11  # R1 shoulder button
-enable_turbo_button: 9  # R2 shoulder button
+enable_button: 5  # R1 shoulder button
+enable_turbo_button: 7  # R2 shoulder button
 
diff --git a/launch/teleop_ps3.launch b/launch/teleop_ps3.launch
index 1944194d1f8febffbe1935c87996d1dc96e92428..6ba1bcff2bb91d7bb6678d916b98ef96cd77dea0 100644
--- a/launch/teleop_ps3.launch
+++ b/launch/teleop_ps3.launch
@@ -3,7 +3,7 @@
 
   <arg name="name" default="teleop_ps3"/>
   <arg name="dev"  default="/dev/input/ps3joy"/>
-  <arg name="config_filepath" default="$(find twist_to_manual_control)/config/ps3.yaml" />
+  <arg name="config_filepath" default="$(find iri_twist_to_manual_control)/config/ps3.yaml" />
   <arg name="speed_topic"    default="/manual_control/speed"/>
   <arg name="steering_topic" default="/steering"/>