diff --git a/bin/chassis_control.py b/bin/chassis_control.py
index b3d622c..0cac579 100755
--- a/bin/chassis_control.py
+++ b/bin/chassis_control.py
@@ -10,7 +10,7 @@
 import Openbmc
 
 DBUS_NAME = 'org.openbmc.control.Chassis'
-OBJ_NAME = '/org/openbmc/control/'+sys.argv[1]
+OBJ_NAME = '/org/openbmc/control/chassis0'
 CONTROL_INTF = 'org.openbmc.Control'
 
 POWER_OFF = 0
@@ -37,7 +37,7 @@
 			},
 			'watchdog' : {				
 				'bus_name' : 'org.openbmc.watchdog.Host',
-				'object_name' : '/org/openbmc/watchdog/HostWatchdog_0',
+				'object_name' : '/org/openbmc/watchdog/host0',
 				'interface_name' : 'org.openbmc.Watchdog'
 			}
 		}
@@ -50,7 +50,7 @@
 
 		bus.add_signal_receiver(self.power_button_signal_handler, 
 					dbus_interface = "org.openbmc.Button", signal_name = "ButtonPressed", 
-					path="/org/openbmc/buttons/PowerButton_0" )
+					path="/org/openbmc/buttons/power0" )
     		bus.add_signal_receiver(self.host_watchdog_signal_handler, 
 					dbus_interface = "org.openbmc.Watchdog", signal_name = "WatchdogError")
 		bus.add_signal_receiver(self.SystemStateHandler,signal_name = "GotoSystemState")
diff --git a/objects/control_host_obj.c b/objects/control_host_obj.c
index d051f88..63a8d64 100644
--- a/objects/control_host_obj.c
+++ b/objects/control_host_obj.c
@@ -12,6 +12,7 @@
 
 /* ---------------------------------------------------------------------------------------------------- */
 static const gchar* dbus_object_path = "/org/openbmc/control";
+static const gchar* instance_name = "host0";
 static const gchar* dbus_name        = "org.openbmc.control.Host";
 
 static GDBusObjectManagerServer *manager = NULL;
@@ -105,17 +106,10 @@
 	ObjectSkeleton *object;
 	//g_print ("Acquired a message bus connection: %s\n",name);
  	cmdline *cmd = user_data;
-	if (cmd->argc < 2)
-	{
-		g_print("No objects created.  Put object name(s) on command line\n");
-		return;
-	}	
   	manager = g_dbus_object_manager_server_new (dbus_object_path);
-  	int i=0;
-  	for (i=1;i<cmd->argc;i++)
-  	{
+
 		gchar *s;
-		s = g_strdup_printf ("%s/%s",dbus_object_path,cmd->argv[i]);
+		s = g_strdup_printf ("%s/%s",dbus_object_path,instance_name);
 		object = object_skeleton_new (s);
 		g_free (s);
 		ControlHost* control_host = control_host_skeleton_new ();
@@ -140,7 +134,7 @@
 		/* Export the object (@manager takes its own reference to @object) */
 		g_dbus_object_manager_server_export (manager, G_DBUS_OBJECT_SKELETON (object));
 		g_object_unref (object);
-	}
+
 	/* Export all objects */
 	g_dbus_object_manager_server_set_connection (manager, connection);
 	
diff --git a/objects/host_watchdog_obj.c b/objects/host_watchdog_obj.c
index b1c8f2b..13208e2 100644
--- a/objects/host_watchdog_obj.c
+++ b/objects/host_watchdog_obj.c
@@ -5,6 +5,7 @@
 /* ---------------------------------------------------------------------------------------------------- */
 
 static const gchar* dbus_object_path = "/org/openbmc/watchdog";
+static const gchar* instance_name = "host0";
 static const gchar* dbus_name        = "org.openbmc.watchdog.Host";
 
 static GDBusObjectManagerServer *manager = NULL;
@@ -87,20 +88,10 @@
                  const gchar     *name,
                  gpointer         user_data)
 {
-  //	g_print ("Acquired a message bus connection: %s\n",name);
-
   	cmdline *cmd = user_data;
-	if (cmd->argc < 2)
-	{
-		g_print("No objects created.  Put object name(s) on command line\n");
-		return;
-	}	
   	manager = g_dbus_object_manager_server_new (dbus_object_path);
-  	int i=0;
-  	for (i=1;i<cmd->argc;i++)
-  	{
 		gchar *s;
- 		s = g_strdup_printf ("%s/%s",dbus_object_path,cmd->argv[i]);
+ 		s = g_strdup_printf ("%s/%s",dbus_object_path,instance_name);
 		ObjectSkeleton *object = object_skeleton_new (s);
 		g_free (s);
 
@@ -135,7 +126,6 @@
   		/* Export the object (@manager takes its own reference to @object) */
   		g_dbus_object_manager_server_export (manager, G_DBUS_OBJECT_SKELETON (object));
   		g_object_unref (object);
-	}
 
   /* Export all objects */
   g_dbus_object_manager_server_set_connection (manager, connection);
diff --git a/objects/led_controller.c b/objects/led_controller.c
index b4cd04d..e11119f 100644
--- a/objects/led_controller.c
+++ b/objects/led_controller.c
@@ -73,11 +73,6 @@
 	ObjectSkeleton *object;
 
 	cmdline *cmd = user_data;
-	if (cmd->argc < 2)
-	{
-		g_print("No objects created.  Put object name(s) on command line\n");
-		return;
-	}	
 
 	manager = g_dbus_object_manager_server_new (dbus_object_path);
 	int i = 0;
diff --git a/objects/power_control_obj.c b/objects/power_control_obj.c
index bdb7c9a..97d1021 100644
--- a/objects/power_control_obj.c
+++ b/objects/power_control_obj.c
@@ -13,6 +13,7 @@
 
 /* ---------------------------------------------------------------------------------------------------- */
 static const gchar* dbus_object_path = "/org/openbmc/control";
+static const gchar* instance_name = "power0";
 static const gchar* dbus_name        = "org.openbmc.control.Power";
 
 //This object will use these GPIOs
@@ -145,8 +146,8 @@
          gpointer                user_data)
 {
 	pgood_timeout_start = 0;
-	guint poll_interval = control_get_poll_interval(control);
-	g_timeout_add(poll_interval, poll_pgood, user_data);
+	//guint poll_interval = control_get_poll_interval(control);
+	//g_timeout_add(poll_interval, poll_pgood, user_data);
 	control_complete_init(control,invocation);
 	return TRUE;
 }
@@ -168,14 +169,14 @@
 {
 	ObjectSkeleton *object;
  	cmdline *cmd = user_data;
-	if (cmd->argc < 2)
+	if (cmd->argc < 3)
 	{
-		g_print("No objects created.  Put object name(s) on command line\n");
+		g_print("Usage: power_control.exe [poll interval] [timeout]\n");
 		return;
 	}	
   	manager = g_dbus_object_manager_server_new (dbus_object_path);
 	gchar *s;
-  	s = g_strdup_printf ("%s/%s",dbus_object_path,cmd->argv[1]);
+  	s = g_strdup_printf ("%s/%s",dbus_object_path,instance_name);
   	object = object_skeleton_new (s);
   	g_free (s);
 
@@ -230,7 +231,19 @@
 	if (rc != GPIO_OK)
 	{
 		printf("ERROR PowerControl: GPIO setup (rc=%d)\n",rc);
-	} 
+	}
+	//start poll
+	pgood_timeout_start = 0;
+	int poll_interval = atoi(cmd->argv[1]);
+	int pgood_timeout = atoi(cmd->argv[2]);
+	if (poll_interval < 1000 || pgood_timeout <5) {
+		printf("ERROR PowerControl: poll_interval < 1000 or pgood_timeout < 5\n");
+	} else {
+		control_set_poll_interval(control,poll_interval);
+		control_power_set_pgood_timeout(control_power,pgood_timeout);
+		g_timeout_add(poll_interval, poll_pgood, object);
+	}
+ 
 }
 
 static void