diff --git a/smach/setup.cfg b/smach/setup.cfg
index 1b11c4d..6ad2624 100644
--- a/smach/setup.cfg
+++ b/smach/setup.cfg
@@ -1,4 +1,4 @@
 [develop]
-script-dir=$base/lib/smach
+script_dir=$base/lib/smach
 [install]
-install-scripts=$base/lib/smach
+install_scripts=$base/lib/smach
diff --git a/smach/setup.py b/smach/setup.py
index 5ec13f9..9386c3a 100644
--- a/smach/setup.py
+++ b/smach/setup.py
@@ -13,12 +13,7 @@
     zip_safe=True,
     maintainer='Isaac I. Y. Saito',
     maintainer_email='gm130s@gmail.com',
-    description='''
-        SMACH is a task-level architecture for rapidly creating complex robot
-        behavior. At its core, SMACH is a ROS-independent Python library to build
-        hierarchical state machines. SMACH is a new library that takes advantage of
-        very old concepts in order to quickly create robust robot behavior with
-        maintainable and modular code.''',
+    description='SMACH is a task-level architecture for rapidly creating complex robot behavior. At its core, SMACH is a ROS-independent Python library to build hierarchical state machines. SMACH is a new library that takes advantage of very old concepts in order to quickly create robust robot behavior with maintainable and modular code.',
     license='BSD',
     data_files=[
         ('share/ament_index/resource_index/packages',
diff --git a/smach_ros/setup.cfg b/smach_ros/setup.cfg
index 97e893c..3b90c58 100644
--- a/smach_ros/setup.cfg
+++ b/smach_ros/setup.cfg
@@ -1,4 +1,4 @@
 [develop]
-script-dir=$base/lib/smach_ros
+script_dir=$base/lib/smach_ros
 [install]
-install-scripts=$base/lib/smach_ros
+install_scripts=$base/lib/smach_ros
diff --git a/smach_ros/setup.py b/smach_ros/setup.py
index ee3b4cf..7c21a78 100644
--- a/smach_ros/setup.py
+++ b/smach_ros/setup.py
@@ -13,12 +13,7 @@
     zip_safe=True,
     maintainer='Isaac I. Y. Saito',
     maintainer_email='gm130s@gmail.com',
-    description='''
-        SMACH is a task-level architecture for rapidly creating complex robot
-        behavior. At its core, SMACH is a ROS-independent Python library to build
-        hierarchical state machines. SMACH is a new library that takes advantage of
-        very old concepts in order to quickly create robust robot behavior with
-        maintainable and modular code.''',
+    description='SMACH is a task-level architecture for rapidly creating complex robot behavior. At its core, SMACH is a ROS-independent Python library to build hierarchical state machines. SMACH is a new library that takes advantage of very old concepts in order to quickly create robust robot behavior with maintainable and modular code.',
     license='BSD',
     data_files=[
         ('share/ament_index/resource_index/packages',