Index: /branches/fscctrl_safety_limits/src/fscctrl.cc
===================================================================
--- /branches/fscctrl_safety_limits/src/fscctrl.cc	(revision 18343)
+++ /branches/fscctrl_safety_limits/src/fscctrl.cc	(revision 18344)
@@ -1183,13 +1183,13 @@
         fFSC.SetPositionsBias(v2);
 
-        fFSC.SetEthernetSwitchCurrentLimit( conf.Get<double>("ethernet_switch") );
-        fFSC.SetFFCcurrentLimit( conf.Get<double>("FFC") );
-        fFSC.SetFLPcurrentLimit( conf.Get<double>("FLP") );
-        fFSC.SetFADdigitalCurrentLimit( conf.Get<double>("FAD_digital") );
-        fFSC.SetFADnegativeCurrentLimit( conf.Get<double>("FAD_negative") );
-        fFSC.SetFADpositiveCurrentLimit( conf.Get<double>("FAD_positive") );
-        fFSC.SetFPAdigitalCurrentLimit( conf.Get<double>("FPA_digital") );
-        fFSC.SetFPAnegativeCurrentLimit( conf.Get<double>("FPA_negative") );
-        fFSC.SetFPApositiveCurrentLimit( conf.Get<double>("FPA_positive") );
+        fFSC.SetEthernetSwitchCurrentLimit( conf.Get<double>("max-current.ethernet-switch") );
+        fFSC.SetFFCcurrentLimit( conf.Get<double>("max-current.FFC") );
+        fFSC.SetFLPcurrentLimit( conf.Get<double>("max-current.FLP") );
+        fFSC.SetFADdigitalCurrentLimit( conf.Get<double>("max-current.FAD-digital") );
+        fFSC.SetFADnegativeCurrentLimit( conf.Get<double>("max-current.FAD-negative") );
+        fFSC.SetFADpositiveCurrentLimit( conf.Get<double>("max-current.FAD-positive") );
+        fFSC.SetFPAdigitalCurrentLimit( conf.Get<double>("max-current.FPA-digital") );
+        fFSC.SetFPAnegativeCurrentLimit( conf.Get<double>("max-current.FPA-negative") );
+        fFSC.SetFPApositiveCurrentLimit( conf.Get<double>("max-current.FPA-positive") );
 
         SetEndpoint(conf.Get<string>("addr"));