diff --git a/script/power-supply.py b/script/power-supply.py
index ac3880e..aca8270 100644
--- a/script/power-supply.py
+++ b/script/power-supply.py
@@ -1,5 +1,9 @@
 #Pre-actions
-caput('PO2DV-NCS-VHQ1:Set-RampA', '10')
+PVSET = 'PO2DV-NCS-VHQ1:Set-RampA'
+PVGETACTUALVA = 'PO2DV-NCS-VHQ1:Actual-VA'
+PVGETACTUALIA = 'PO2DV-NCS-VHQ1:Actual-IA'
+
+caput(PVSET, '10')
 sleep(0.1)
 
 #TODO: Set the diplay names of positioners and detectors
@@ -9,12 +13,12 @@ scan.start()
 
 #Creating channels: dimension 1
 #LinearPositioner SetVA
-SetVA = Channel('PO2DV-NCS-VHQ1:Set-VA', type = 'd')
+SetVA = Channel(PVSET, type = 'd')
 #Timestamp time
 #ScalarDetector ActualVA
-ActualVA = Channel('PO2DV-NCS-VHQ1:Actual-VA', type = 'd')
+ActualVA = Channel(PVGETACTUALVA, type = 'd')
 #ScalarDetector ActualIA
-ActualIA = Channel('PO2DV-NCS-VHQ1:Actual-IA', type = 'd')
+ActualIA = Channel(PVGETACTUALIA, type = 'd')
 
 #set voltage to 0
 print 'Ramping down power supply to 0V'