diff --git a/src/main.cpp b/src/main.cpp
index 8954c14d4f17e58e3420abf12cbc31626ad96224..00914d13ee1200a92de5d44c0a901f022a3bf1d9 100755
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -30,31 +30,6 @@
 int main( int argc, char ** argv ) {
     QString paramString, modNum;
     modNum = argv[1];
-/*
-int i = 0;
-    if (!strcmp(argv[1], "01") || !strcmp(argv[1], "02") || !strcmp(argv[1], "10")) {
-      paramString = "kg"+modNum+"/mod/ross kg"+modNum+"/mod/super kg"+modNum+"/mod/general f/interlock/mod"+modNum;
-    }
-    else {
-	    QMessageBox::information(0, "Error in startup parameters",
-		QString("Error starting the program \"%1 %2\"\nUsage:\n"
-			"%1 modulator_number\n"
-			"modulator_number: [01 || 02 || 10]\n").arg(
-				argv[0]).arg(argv[1]));
-	    exit(EXIT_FAILURE);
-    }
-    QStringList paramArray = paramString.split(" ");
-    char ** my_argv = (char **) malloc(sizeof(char *) * paramArray.size() + 2);
-    my_argv[i] = (char *) malloc(sizeof(char) * strlen(argv[0]) + 1);
-    strcpy(my_argv[i],argv[0]);
-    for(i = 1; i <= paramArray.size(); i++)
-    {
-	my_argv[i] = (char *) malloc(sizeof(char) * paramArray[i-1].length() + 1);
-        strcpy(my_argv[i], paramArray[i-1].toStdString().c_str());
-    }
-    my_argv[i++] = NULL;
-    QApplication a( i, my_argv );
-*/
     TApplication a(argc, argv);
     a.setApplicationVersion(CVSVERSION);
     TUtil::instance()->setLoggingTarget(argv[0]);
@@ -78,20 +53,6 @@ int i = 0;
     */
      // QString paramString, modNum;
      modNum = argv[1];
-     /*
-     if (!strcmp(argv[1], "01") || !strcmp(argv[1], "02") || !strcmp(argv[1], "10")) {
-       paramString = "kg"+modNum+"/mod/ross kg"+modNum+"/mod/hv kg"+modNum+"/mod/general f/interlock/mod"+modNum+" kg"+modNum+"/mod/rfamp kg"+modNum+"/mod/thyfil kg"+modNum+"/mod/klyfil kg"+modNum+"/mod/modtiming kg"+modNum+"/mod/scope";
-     }
-     else {
- 	    QMessageBox::information(0, "Error in startup parameters",
- 		QString("Error starting the program \"%1 %2\"\nUsage:\n"
- 			"%1 modulator_number\n"
- 			"modulator_number: [01 || 02 || 10]\n").arg(
- 				argv[0]).arg(argv[1]));
- 	    exit(EXIT_FAILURE);
-     }
-     QStringList paramArray = paramString.split(" ");
-     */
 
     super mw;
     // TUtil::replaceWildcards(mw.children(), a.arguments());
diff --git a/src/super.cpp b/src/super.cpp
index 7787d1bd7c00ee2cd4d8f08a4632c3ab30a3ab25..74398b0da5bbe0012652bece72e48d59a073e50e 100755
--- a/src/super.cpp
+++ b/src/super.cpp
@@ -193,7 +193,7 @@ super::super(QWidget *parent) : QWidget(parent)
 {
 	ActionFactory::actionFactory()->setDefaultRefreshMode(POLLED_REFRESH);
 	evrServer = rossServer = condServer = hvServer = generalServer = interlockServer = thyfilServer = llrfServer = timingServer = scopeServer = premagServer = acsServer = mioServer = 0;
-	connectDevice("kg04/power_supply/psklyfil_kg04.01", &klyfilServer);
+	connectDevice("k04/power_supply/psklyfil_k04.01", &klyfilServer);
 	connectDevice("ec-mod-kg05-03/mio/ffff0200", &mioServer);
 	connectDevice("usa/mps/shutter", &shutterServer);
 	setenv("QTANGO_ATTR_CONF_CHANGE_DISABLED", "1", 1);
@@ -237,24 +237,22 @@ super::super(QWidget *parent) : QWidget(parent)
 
 	rfampServer00=rfampServer01=rfampServer02=rfampServer03=rfampServer04=rfampServer05=rfampServer06=rfampServer07=
 	rfampServer08=rfampServer09=rfampServer10=rfampServer11=rfampServer12=rfampServer13=rfampServer14=rfampServer15 = NULL;
-	connectDevice("kgsp/mod/rfamp", &rfampServer00);
-	connectDevice("kg01/mod/rfamp", &rfampServer01);
-	connectDevice("kg02/mod/rfamp", &rfampServer02);
-	connectDevice("kg03/mod/rfamp", &rfampServer03);
-	// connectDevice("kg04/mod/twtrfamp_kg04.01", &rfampServer04);
-	// connectDevice("kg04/mod/rfamp", &rfampServer04);
+	connectDevice("ks/mod/rfamp_ks.01", &rfampServer00);
+	connectDevice("k01/mod/rfamp_k01.01", &rfampServer01);
+	connectDevice("k02/mod/rfamp_k02.01", &rfampServer02);
+	connectDevice("k03/mod/rfamp_k03.01", &rfampServer03);
 	connectDevice(K4RfAmp.c_str(), &rfampServer04);
-	connectDevice("kg05/mod/rfamp_kg05.01", &rfampServer05);
-	connectDevice("kg06/mod/rfamp", &rfampServer06);
-	connectDevice("kg07/mod/rfamp", &rfampServer07);
-	connectDevice("kg08/mod/rfamp", &rfampServer08);
-	connectDevice("kg09/mod/rfamp", &rfampServer09);
-	connectDevice("kg10/mod/rfamp", &rfampServer10);
-	connectDevice("kg11/mod/rfamp", &rfampServer11);
-	connectDevice("kg12/mod/rfamp", &rfampServer12);
-	connectDevice("kg13/mod/rfamp", &rfampServer13);
-	connectDevice("kg14/mod/rfamp", &rfampServer14);
-	connectDevice("kg15/mod/rfamp", &rfampServer15);
+	connectDevice("k05/mod/rfamp_k05.01", &rfampServer05);
+	connectDevice("k06/mod/rfamp_k06.01", &rfampServer06);
+	connectDevice("k07/mod/rfamp_k07.01", &rfampServer07);
+	connectDevice("k08/mod/rfamp_k08.01", &rfampServer08);
+	connectDevice("k09/mod/rfamp_k09.01", &rfampServer09);
+	connectDevice("k10/mod/rfamp_k10.01", &rfampServer10);
+	connectDevice("k11/mod/rfamp_k11.01", &rfampServer11);
+	connectDevice("k12/mod/rfamp_k12.01", &rfampServer12);
+	connectDevice("k13/mod/rfamp_k13.01", &rfampServer13);
+	connectDevice("k14/mod/rfamp_k14.01", &rfampServer14);
+	connectDevice("k15/mod/rfamp_k15.01", &rfampServer15);
 
 	myRefresh();
 	// init timer
@@ -597,7 +595,7 @@ super::super(QWidget *parent) : QWidget(parent)
 		QString filename;
 		filename.append(QDir::homePath()+"/modsuper.log");
 		myfile.open(filename.toStdString().c_str(), ios::out | ios::app);
-		myfile << QDateTime::currentDateTime().toString().toStdString() << " " << host << " kg" << modNum.toStdString() << "/mod/rfamp/KlystronPhase: " << value << endl;
+		myfile << QDateTime::currentDateTime().toString().toStdString() << " " << host << " k" << modNum.toStdString() << "/mod/rfamp_k" << modNum.toStdString() << "/KlystronPhase: " << value << endl;
 		myfile.close();
 	}
 
@@ -609,7 +607,7 @@ super::super(QWidget *parent) : QWidget(parent)
 		QString filename;
 		filename.append(QDir::homePath()+"/modsuper.log");
 		myfile.open(filename.toStdString().c_str(), ios::out | ios::app);
-		myfile << QDateTime::currentDateTime().toString().toStdString() << " " << host << " kg" << modNum.toStdString() << "/mod/rfamp/KlystronPhaseRelative: " << value << endl;
+		myfile << QDateTime::currentDateTime().toString().toStdString() << " " << host << " k" << modNum.toStdString() << "/mod/rfamp_k" << modNum.toStdString() << ".01/KlystronPhaseRelative: " << value << endl;
 		myfile.close();
 	}
 
@@ -640,11 +638,6 @@ super::super(QWidget *parent) : QWidget(parent)
 		catch (Tango::DevFailed &e) {
 			Tango::Except::print_exception(e);
 		}
-		/*
-		if (rfampServer) delete rfampServer;
-		rfampServer = 0;
-		connectDevice("kg04/mod/rfamp", &rfampServer);
-		*/
 		try {
 			if (rfampServer04) rfampServer04->command_inout("On");
 		}
@@ -717,37 +710,19 @@ super::super(QWidget *parent) : QWidget(parent)
 		catch (Tango::DevFailed &e) {
 			Tango::Except::print_exception(e);
 		}
-		/*
-		if (rfampServer) delete rfampServer;
-		rfampServer = 0;
-		connectDevice("kg015/mod/rfamp", &rfampServer);
-		try {
-			if (rfampServer) rfampServer->command_inout("On");
-		}
-		catch (Tango::DevFailed &e) {
-			Tango::Except::print_exception(e);
-			// QMessageBox::warning(0, "cannot stop RF pilot ",QString(e.errors[0].desc));
-		}
-		*/
 	}
 
 	void super::stop_mod()
 	{
 		if (hvServer) {delete hvServer; hvServer = 0;}
-		if (!modNum.compare("05")) {
-			connectDevice("kg05/mod/hv_kg05.01", &hvServer);
-		}
-		else if (!modNum.compare("XS")) {
+		if (!modNum.compare("XS")) {
 			connectDevice("kxs/mod/hv_kxs.01", &hvServer);
 		}
 		else if (!modNum.compare("ST")) {
-			connectDevice("kst/mod/hv", &hvServer);
-		}
-		else if (!modNum.compare("16")) {
-			connectDevice("k16/mod/hv", &hvServer);
+			connectDevice("kst/mod/hv_kst.01", &hvServer);
 		}
 		else {
-			connectDevice("kg"+modNum+"/mod/hv", &hvServer);
+			connectDevice("k"+modNum+"/mod/hv_k"+modNum+".01", &hvServer);
 		}
 		try {
 			hvServer->command_inout("Stop");
@@ -760,20 +735,14 @@ super::super(QWidget *parent) : QWidget(parent)
 			cout << "-------------------------------------------------------- hvServer->command_inout(Stop)" << endl;
 		}
 		if (rossServer) {delete rossServer; rossServer = 0;}
-		if (!modNum.compare("05")) {
-			connectDevice("kg05/mod/ross_kg05.01", &rossServer);
-		}
-		else if (!modNum.compare("XS")) {
+		if (!modNum.compare("XS")) {
 			connectDevice("kxs/mod/ross_kxs.01", &rossServer);
 		}
 		else if (!modNum.compare("ST")) {
-			connectDevice("kg05/mod/ross_kg05.03", &rossServer);
-		}
-		else if (!modNum.compare("16")) {
-			connectDevice("k16/mod/ross", &rossServer);
+			connectDevice("kst/modross_kst.01", &rossServer);
 		}
 		else {
-			connectDevice("kg"+modNum+"/mod/ross", &rossServer);
+			connectDevice("k"+modNum+"/mod/ross_k"+modNum+".01", &rossServer);
 		}
 		try {
 			hvServer->command_inout("Stop");
@@ -786,20 +755,14 @@ super::super(QWidget *parent) : QWidget(parent)
 			cout << "--------------------------------------------------------hvServer->command_inout(Stop)" << endl;
 		}
 		if (generalServer) {delete generalServer; generalServer = 0;}
-		if (!modNum.compare("05")) {
-			connectDevice("kg05/mod/general_kg05.01", &generalServer);
-		}
-		else if (!modNum.compare("XS")) {
-			connectDevice("kg05/mod/general_kxs.01", &generalServer);
+		if (!modNum.compare("XS")) {
+			connectDevice("kxs/mod/general_kxs.01", &generalServer);
 		}
 		else if (!modNum.compare("ST")) {
-			connectDevice("kg05/mod/general_kg05.03", &generalServer);
-		}
-		else if (!modNum.compare("16")) {
-			connectDevice("k16/mod/general", &generalServer);
+			connectDevice("kst/mod/general_kst.01", &generalServer);
 		}
 		else {
-			connectDevice("kg"+modNum+"/mod/general", &generalServer);
+			connectDevice("k"+modNum+"/mod/general_k"+modNum+".01", &generalServer);
 		}
 		try {
 			generalServer->command_inout("Stop");
@@ -884,10 +847,10 @@ super::super(QWidget *parent) : QWidget(parent)
 		if (!modNum.compare("18")) {modNum = "XS";}
 		if (hvServer) {delete hvServer; hvServer = 0;}
 		if (!modNum.compare("05")) {
-			connectDevice("kg"+modNum+"/mod/hv_kg"+modNum+".01", &hvServer);
+			connectDevice("k"+modNum+"/mod/hv_k"+modNum+".01", &hvServer);
 		}
 		else if (!modNum.compare("XS")) {
-			connectDevice("kg05/mod/hv_kxs.01", &hvServer);
+			connectDevice("kst/modhv_kxs.01", &hvServer);
 		}
 		else if (!modNum.compare("ST")) {
 			connectDevice("kst/mod/hv", &hvServer);
@@ -896,7 +859,7 @@ super::super(QWidget *parent) : QWidget(parent)
 			connectDevice("k16/mod/hv", &hvServer);
 		}
 		else {
-			connectDevice("kg"+modNum+"/mod/hv", &hvServer);
+			connectDevice("k"+modNum+"/mod/hv_k"+modNum+".01", &hvServer);
 		}
 
 		sleep(0.2);
@@ -1140,11 +1103,11 @@ super::super(QWidget *parent) : QWidget(parent)
 			ui.SF6Close->hide();
 			ui.SF6Stat->hide();
 			// main tab
-			ui.phi_a->setSource("kg05/mod/rfamp_kg05.03/KlystronPhase");
-			ui.phi_r->setSource("kg05/mod/rfamp_kg05.03/KlystronPhaseRelative");
-			ui.phi_a_set->setTargets("kg05/mod/rfamp_kg05.03/KlystronPhase");
-			ui.phi_r_set->setTargets("kg05/mod/rfamp_kg05.03/KlystronPhaseRelative");
-			ui.reset_phi->setTargets("kg05/mod/rfamp_kg05.03->ResetKlystronPhase");
+			ui.phi_a->setSource("kst/modrfamp_kst.01/KlystronPhase");
+			ui.phi_r->setSource("kst/modrfamp_kst.01/KlystronPhaseRelative");
+			ui.phi_a_set->setTargets("kst/modrfamp_kst.01/KlystronPhase");
+			ui.phi_r_set->setTargets("kst/modrfamp_kst.01/KlystronPhaseRelative");
+			ui.reset_phi->setTargets("kst/modrfamp_kst.01->ResetKlystronPhase");
 			ui.voltageSet_Scalar_2->setSource("kst/mod/hv/VoltageSet");
 			ui.setVlt->setTargets("kst/mod/hv/VoltageSet");
 			ui.power->setSource("kst/mod/llrf_kst.01/amp_cav");
@@ -1152,33 +1115,33 @@ super::super(QWidget *parent) : QWidget(parent)
 			ui.setPower->setTargets("kst/mod/llrf_kst.01/cav_amp_set");
 
 			// general (switch) tab
-			ui.ButtonOff->setTargets("kg05/mod/general_kg05.03->CmdOff");
-			ui.ButtonHeated->setTargets("kg05/mod/general_kg05.03->CmdHeated");
-			ui.ButtonStandby->setTargets("kg05/mod/general_kg05.03->CmdStandby");
-			ui.ButtonLowPower->setTargets("kg05/mod/general_kg05.03->CmdLowPower");
-			ui.ButtonFullPower->setTargets("kg05/mod/modcond_kg05.03->On");
-			ui.OFF_Led->setSource("kg05/mod/general_kg05.03/Off");
-			ui.Heated_Led->setSource("kg05/mod/general_kg05.03/Heated");
-			ui.Standby_Led->setSource("kg05/mod/general_kg05.03/Standby");
-			ui.LowPower_Led->setSource("kg05/mod/general_kg05.03/LowPower");
-			ui.FullPower_Led->setSource("kg05/mod/general_kg05.03/FullPower");
-			ui.peakI_2->setSource("kg05/mod/scopemod_kg05.03/C1TOP");
+			ui.ButtonOff->setTargets("kst/modgeneral_kst.01->CmdOff");
+			ui.ButtonHeated->setTargets("kst/modgeneral_kst.01->CmdHeated");
+			ui.ButtonStandby->setTargets("kst/modgeneral_kst.01->CmdStandby");
+			ui.ButtonLowPower->setTargets("kst/modgeneral_kst.01->CmdLowPower");
+			ui.ButtonFullPower->setTargets("kst/modmodcond_kst.01->On");
+			ui.OFF_Led->setSource("kst/modgeneral_kst.01/Off");
+			ui.Heated_Led->setSource("kst/modgeneral_kst.01/Heated");
+			ui.Standby_Led->setSource("kst/modgeneral_kst.01/Standby");
+			ui.LowPower_Led->setSource("kst/modgeneral_kst.01/LowPower");
+			ui.FullPower_Led->setSource("kst/modgeneral_kst.01/FullPower");
+			ui.peakI_2->setSource("kst/modscopemod_kst.01/C1TOP");
 			ui.voltage_Scalar_2->setSource("kst/mod/hv/Voltage");
-			ui.TimeToGo_Viewer->setSource("kg05/mod/general_kg05.03/TimeString");
-			ui.Interlock_Led->setSource("kg05/mod/general_kg05.03/Interlock");
-			ui.Timing_Led->setSource("kg05/mod/modtiming_kg05.03/RfBeginEnab");
-			ui.Rfamp_Led->setSource("kg05/mod/rfamp_kg05.03/IsOn");
-			ui.Fault_Viewer->setSource("kg05/mod/super_kg05.03/ReadLastError");
-			ui.ButtonFaultAck->setTargets("kg05/mod/super_kg05.03->Reset");
+			ui.TimeToGo_Viewer->setSource("kst/modgeneral_kst.01/TimeString");
+			ui.Interlock_Led->setSource("kst/modgeneral_kst.01/Interlock");
+			ui.Timing_Led->setSource("kst/modmodtiming_kst.01/RfBeginEnab");
+			ui.Rfamp_Led->setSource("kst/modrfamp_kst.01/IsOn");
+			ui.Fault_Viewer->setSource("kst/modsuper_kst.01/ReadLastError");
+			ui.ButtonFaultAck->setTargets("kst/modsuper_kst.01->Reset");
 
 			// HV tab
-			ui.Ross_ON->setTargets("kg05/mod/ross_kg05.03->On");
-			ui.Ross_Ground->setTargets("kst/mod/hv->Off;kg05/mod/ross_kg05.03->Off");
-			ui.Ross_Position->setSource("kg05/mod/ross_kg05.03/Position");
+			ui.Ross_ON->setTargets("kst/modross_kst.01->On");
+			ui.Ross_Ground->setTargets("kst/mod/hv->Off;kst/modross_kst.01->Off");
+			ui.Ross_Position->setSource("kst/modross_kst.01/Position");
 			ui.Ross_Interlock_Enable->setSource("kst/interlock/mod_kst/StatHvEnable");
 			ui.Ross_Interlock_Enable->setDisplayMask(QList<unsigned>() << 5);
 			ui.Ross_Acs_Enable->setDisplayMask(QList<unsigned>() << modNum.toUInt());
-			ui.HV_ON->setTargets("kg05/mod/ross_kg05.03->On;kst/mod/hv->ON");
+			ui.HV_ON->setTargets("kst/modross_kst.01->On;kst/mod/hv->ON");
 			ui.HV_OFF->setTargets("kst/mod/hv->Off");
 			ui.LowPowerStat->setSource("kst/mod/hv/LowPowerStat");
 			ui.voltage_Scalar->setSource("kst/mod/hv/Voltage");
@@ -1187,42 +1150,42 @@ super::super(QWidget *parent) : QWidget(parent)
 			ui.current_Scalar->setSource("kst/mod/hv/Current");
 			ui.currentSet_Scalar->setSource("kst/mod/hv/CurrentSet");
 			ui.setCur_ApplyNumeric->setTargets("kst/mod/hv/CurrentSet");
-			ui.RampUp_PushButton_2->setTargets("kg05/mod/modcond_kg05.03->On");
+			ui.RampUp_PushButton_2->setTargets("kst/modmodcond_kst.01->On");
 			ui.rampStat->setSource("kst/mod/hv/RampStat");
-			ui.timeToFullPower_Scalar->setSource("kg05/mod/general_kg05.03/TimeString");
-			ui.Stop_PushButton_2->setTargets("kg05/mod/ross_kg05.03->Stop;kst/mod/hv->Stop");
+			ui.timeToFullPower_Scalar->setSource("kst/modgeneral_kst.01/TimeString");
+			ui.Stop_PushButton_2->setTargets("kst/modross_kst.01->Stop;kst/mod/hv->Stop");
 
 			// Ramp tab
 			ui.default_ramp->setSource("kst/mod/hv/getDefaultRamp");
-			ui.ButtonFullPower_2->setTargets("kg05/mod/modcond_kg05.03->On");
+			ui.ButtonFullPower_2->setTargets("kst/modmodcond_kst.01->On");
 			ui.rampDown_ApplyNumeric->setTargets("kst/mod/hv->RampDown");
-			ui.Conditioning_State->setSource("kg05/mod/modcond_kg05.03/State");
+			ui.Conditioning_State->setSource("kst/modmodcond_kst.01/State");
 
 			// Timing tab
-			ui.ThyratronEnable->setSource("kg05/mod/modtiming_kg05.03/ThyratronEnab");
-			ui.Thyratron->setSource("kg05/mod/modtiming_kg05.03/Thyratron");
-			ui.ThyratronSet->setTargets("kg05/mod/modtiming_kg05.03/Thyratron");
-			ui.OfflineMode->setSource("f/timing/rttrigger_mod_kg05.03/EnableStaticTriggerShift");
-			ui.OfflineMode->setTargets("f/timing/rttrigger_mod_kg05.03/EnableStaticTriggerShift");
+			ui.ThyratronEnable->setSource("kst/modmodtiming_kst.01/ThyratronEnab");
+			ui.Thyratron->setSource("kst/modmodtiming_kst.01/Thyratron");
+			ui.ThyratronSet->setTargets("kst/modmodtiming_kst.01/Thyratron");
+			ui.OfflineMode->setSource("f/timing/rttrigger_mod_kst.01/EnableStaticTriggerShift");
+			ui.OfflineMode->setTargets("f/timing/rttrigger_mod_kst.01/EnableStaticTriggerShift");
 			ui.RfWidthEnable->setSource("kst/mod/llrf_kst.01/pulse_state");
 			ui.RfWidth->setSource("kst/mod/llrf_kst.01/RfLength");
 			ui.RfWidthSet->setTargets("kst/mod/llrf_kst.01/RfLength");
 			ui.RfEndEnable->setSource("kst/mod/llrf_kst.01/pulse_state");
 			ui.RfEnd->setSource("kst/mod/llrf_kst.01/RfEnd");
 			ui.RfEndSet->setTargets("kst/mod/llrf_kst.01/RfEnd");
-			ui.ThyratronInterlock->setSource("kg05/mod/modtiming_kg05.03/HvFault");
+			ui.ThyratronInterlock->setSource("kst/modmodtiming_kst.01/HvFault");
 			ui.RfInterlock->setSource("kst/mod/llrf_kst.01/Interlock_state");
-			ui.ResetInterlock->setTargets("kst/mod/llrf_kst.01->ResetInterlock;kg05/mod/modtiming_kg05.03->Reset;f/interlock/mod05->Acknowledge");
+			ui.ResetInterlock->setTargets("kst/mod/llrf_kst.01->ResetInterlock;kst/modmodtiming_kst.01->Reset;f/interlock/mod05->Acknowledge");
 			ui.rfReverseAB_2->setNumColumns(2);
 			ui.rfReverseAB_2->setDisplayMask("2,3");
 			ui.rfReverseAB_2->setSource("kst/interlock/mod_kst/StatRfTrigger");
-			ui.ThyratronOn->setTargets("kg05/mod/modtiming_kg05.03->ThyMeaOn");
-			ui.ThyratronOff->setTargets("kg05/mod/modtiming_kg05.03->ThyMeaOff");
-			ui.Rfamp_Led_2->setSource("kg05/mod/rfamp_kg05.03/IsOn");
-			ui.rfamp_reset_2->setTargets("kg05/mod/rfamp_kg05.03->ResetReversePower");
-			ui.RfOff->setTargets("kg05/mod/modtiming_kg05.03->RfOff");
-			ui.RfOn->setTargets("kg05/mod/modtiming_kg05.03->RfOn;kst/interlock/mod_kst->Ackmod");
-			ui.klyfil_state_k4->setSource("kg05/power_supply/psklyfil_kg05.03/State");
+			ui.ThyratronOn->setTargets("kst/modmodtiming_kst.01->ThyMeaOn");
+			ui.ThyratronOff->setTargets("kst/modmodtiming_kst.01->ThyMeaOff");
+			ui.Rfamp_Led_2->setSource("kst/modrfamp_kst.01/IsOn");
+			ui.rfamp_reset_2->setTargets("kst/modrfamp_kst.01->ResetReversePower");
+			ui.RfOff->setTargets("kst/modmodtiming_kst.01->RfOff");
+			ui.RfOn->setTargets("kst/modmodtiming_kst.01->RfOn;kst/interlock/mod_kst->Ackmod");
+			ui.klyfil_state_k4->setSource("kst/power_supply/psklyfil_kst.01/State"); // renaming
 			ui.RfRev->setSource("kst/mod/llrf_kst.01/RfReverse");
 
 			// Filaments tab
@@ -1230,49 +1193,49 @@ super::super(QWidget *parent) : QWidget(parent)
 			ui.thyfil_enable->setDisplayMask("7");
 			ui.thyfil_psk_stat->setSource("kst/interlock/mod_kst/StatHvEnable");
 			ui.thyfil_psk_stat->setDisplayMask("6");
-			ui.thyfil_vlt->setSource("kg05/mod/thyfil_kg05.03/Voltage");
-			ui.thyfil_cur->setSource("kg05/mod/thyfil_kg05.03/Current");
-			ui.thyfil_off->setTargets("kg05/mod/thyfil_kg05.03->Off");
-			ui.thyfil_isOff->setSource("kg05/mod/thyfil_kg05.03/IsOff");
-			ui.thyfil_on->setTargets("kg05/mod/thyfil_kg05.03->On");
-			ui.thyfil_isOn->setSource("kg05/mod/thyfil_kg05.03/IsOn");
-			ui.thyfil_reset->setTargets("kg05/mod/thyfil_kg05.03->Reset");
+			ui.thyfil_vlt->setSource("kst/modthyfil_kst.01/Voltage");
+			ui.thyfil_cur->setSource("kst/modthyfil_kst.01/Current");
+			ui.thyfil_off->setTargets("kst/modthyfil_kst.01->Off");
+			ui.thyfil_isOff->setSource("kst/modthyfil_kst.01/IsOff");
+			ui.thyfil_on->setTargets("kst/modthyfil_kst.01->On");
+			ui.thyfil_isOn->setSource("kst/modthyfil_kst.01/IsOn");
+			ui.thyfil_reset->setTargets("kst/modthyfil_kst.01->Reset");
 			ui.klyfil_enable->setSource("kst/interlock/mod_kst/StatHvEnable");
 			ui.klyfil_enable->setDisplayMask("9");
 			ui.klyfil_psk_stat->show();
 			ui.klyfil_psk_stat->setSource("kst/interlock/mod_kst/StatHvEnable");
 			ui.klyfil_psk_stat->setDisplayMask("8");
 
-			ui.klyfil_vlt->setSource("kg05/mod/klyfil_kg05.03/Voltage");
-			ui.klyfil_cur->setSource("kg05/mod/klyfil_kg05.03/Current");
-			ui.klyfil_vlt->setSource("kg05/mod/klyfil_kg05.03/Voltage");
-			ui.klyfil_cur->setSource("kg05/mod/klyfil_kg05.03/Current");
-			ui.klyfil_off->setTargets("kg05/mod/klyfil_kg05.03->Off");
-			ui.klyfil_isOff->setSource("kg05/mod/klyfil_kg05.03/IsOff");
-			ui.klyfil_80->setTargets("kg05/mod/klyfil_kg05.03->Standby");
-			ui.klyfil_is80->setSource("kg05/mod/klyfil_kg05.03/Is80");
-			ui.klyfil_100->setTargets("kg05/mod/klyfil_kg05.03->On");
-			ui.klyfil_is100->setSource("kg05/mod/klyfil_kg05.03/Is100");
-			ui.klyfil_reset->setTargets("kg05/mod/klyfil_kg05.03->Reset");
+			ui.klyfil_vlt->setSource("kst/modklyfil_kst.01/Voltage");
+			ui.klyfil_cur->setSource("kst/modklyfil_kst.01/Current");
+			ui.klyfil_vlt->setSource("kst/modklyfil_kst.01/Voltage");
+			ui.klyfil_cur->setSource("kst/modklyfil_kst.01/Current");
+			ui.klyfil_off->setTargets("kst/modklyfil_kst.01->Off");
+			ui.klyfil_isOff->setSource("kst/modklyfil_kst.01/IsOff");
+			ui.klyfil_80->setTargets("kst/modklyfil_kst.01->Standby");
+			ui.klyfil_is80->setSource("kst/modklyfil_kst.01/Is80");
+			ui.klyfil_100->setTargets("kst/modklyfil_kst.01->On");
+			ui.klyfil_is100->setSource("kst/modklyfil_kst.01/Is100");
+			ui.klyfil_reset->setTargets("kst/modklyfil_kst.01->Reset");
 
 			// Pulse tab
 			ui.kly_vac_fault->setDisplayMask("2");
 			ui.piri_a_fault->setDisplayMask("3");
 			ui.piri_b_fault->setDisplayMask("4");
-			ui.premag_cur->setSource("kg05/mod/premag_kg05.03/Current");
-			ui.premag_off->setTargets("kg05/mod/premag_kg05.03->Off");
-			ui.premag_on->setTargets("kg05/mod/premag_kg05.03->On");
-			ui.premag_stat->setSource("kg05/mod/premag_kg05.03/State");
+			ui.premag_cur->setSource("kst/modpremag_kst.01/Current");
+			ui.premag_off->setTargets("kst/modpremag_kst.01->Off");
+			ui.premag_on->setTargets("kst/modpremag_kst.01->On");
+			ui.premag_stat->setSource("kst/modpremag_kst.01/State");
 			ui.kly_vac_fault->setSource("kst/interlock/mod_kst/StatThyTriggerEnable");
 			ui.piri_a_fault->setSource("kst/interlock/mod_kst/StatThyTriggerEnable");
 			ui.piri_b_fault->setSource("kst/interlock/mod_kst/StatThyTriggerEnable");
-			ui.reset_piri->setTargets("kg05/mod/rfamp_kg05.03->ResetPiri");
-			ui.vacuumKly->setSource("kg05/mod/klyfil_kg05.03/KlystronPressure");
-			ui.vacuumKlyInt->setSource("kg05/mod/klyfil_kg05.03/KlystronPressureIntegrated");
-			ui.KlyCollTemp->setSource("kg05/mod/klyfil_kg05.03/KlystronCollectorTemperature");
-			ui.peakI->setSource("kg05/mod/scopemod_kg05.03/C1TOP");
-			ui.revI->setSource("kg05/mod/scopemod_kg05.03/C1PKPK");
-			ui.reset_pi->setTargets("kg05/mod/klyfil_kg05.03->ResetIonicPump");
+			ui.reset_piri->setTargets("kst/modrfamp_kst.01->ResetPiri");
+			ui.vacuumKly->setSource("kst/modklyfil_kst.01/KlystronPressure");
+			ui.vacuumKlyInt->setSource("kst/modklyfil_kst.01/KlystronPressureIntegrated");
+			ui.KlyCollTemp->setSource("kst/modklyfil_kst.01/KlystronCollectorTemperature");
+			ui.peakI->setSource("kst/modscopemod_kst.01/C1TOP");
+			ui.revI->setSource("kst/modscopemod_kst.01/C1PKPK");
+			ui.reset_pi->setTargets("kst/modklyfil_kst.01->ResetIonicPump");
 
 			// SF6 tab
 			ui.SF6Press->setSource("kst/interlock/sf6_kst/SF6Press");
@@ -1288,29 +1251,29 @@ super::super(QWidget *parent) : QWidget(parent)
 			ui.frame_sf6_ctf->hide();
 
 			// Misc tab
-			ui.repetition_rate->setSource("kg05/mod/modfreq_kg05.03/Frequency");
-			cmd_rfamp_on->setTargets("kg05/mod/rfamp_kg05.03->On");
-			cmd_rfamp_off->setTargets("kg05/mod/rfamp_kg05.03->Off");
+			ui.repetition_rate->setSource("kst/modmodfreq_kst.01/Frequency");
+			cmd_rfamp_on->setTargets("kst/modrfamp_kst.01->On");
+			cmd_rfamp_off->setTargets("kst/modrfamp_kst.01->Off");
 			ui.rfamp_stat->unsetSource(); ui.rfamp_stat->setText(" ");
 			cout << "read_bit(mioServer, 15): " << read_bit(mioServer, 15) << endl;
 			if (read_bit(mioServer, 15)==1) {ui.rfamp_stat->setText("ON");mypalette.setColor(QPalette::Window, QColor("#80ff80"));} else {ui.rfamp_stat->setText("OFF");mypalette.setColor(QPalette::Window, QColor("#ffffff"));} ui.rfamp_stat->setPalette(mypalette);
-			ui.rfamp_reset->setTargets("kg05/mod/rfamp_kg05.03->ResetReversePower");
+			ui.rfamp_reset->setTargets("kst/modrfamp_kst.01->ResetReversePower");
 			ui.rfReverseAB->setNumColumns(1);
 			ui.rfReverseAB->setDisplayMask("12");
 			ui.rfReverseAB->setSource("kst/interlock/mod_kst/StatThyTriggerEnable");
 			ui.rfReverseAB->setTrueColors(ui.rfReverseAB_2->trueColors());
-			ui.foc_off->setTargets("kg05/power_supply/psklyfoc_kg05.11->Off;kg05/power_supply/psklyfoc_kg05.12->Off;kg05/power_supply/psklyfoc_kg05.13->Off");
-			ui.foc_on->setTargets("kg05/power_supply/psklyfoc_kg05.11->On;kg05/power_supply/psklyfoc_kg05.12->On;kg05/power_supply/psklyfoc_kg05.13->On");
-			ui.foc_stat_1->setSource("kg05/power_supply/psklyfoc_kg05.11/State");
-			ui.foc_stat_2->setSource("kg05/power_supply/psklyfoc_kg05.12/State");
-			ui.foc_stat_3->setSource("kg05/power_supply/psklyfoc_kg05.13/State");
+			ui.foc_off->setTargets("kst/power_supply/psklyfoc_kst.01->Off;kst/power_supply/psklyfoc_kst.02->Off;kst/power_supply/psklyfoc_kst.03->Off");
+			ui.foc_on->setTargets("kst/power_supply/psklyfoc_kst.01->On;kst/power_supply/psklyfoc_kst.02->On;kst/power_supply/psklyfoc_kst.03->On");
+			ui.foc_stat_1->setSource("kst/power_supply/psklyfoc_kst.01/State");
+			ui.foc_stat_2->setSource("kst/power_supply/psklyfoc_kst.02/State");
+			ui.foc_stat_3->setSource("kst/power_supply/psklyfoc_kst.03/State");
 			ui.foc_stat_1_label->setText("1");
 			ui.foc_stat_2_label->setText("2");
 			ui.foc_stat_3_label->setText("3");
 			ui.reset_k4->setTargets("f/interlock/fock16->DeltaAlarmRestart");
-			ui.fug_begin->setSource("kg05/mod/modtiming_kg05.03/FugBegin");
-			ui.fug_width->setSource("kg05/mod/modtiming_kg05.03/FugWidth");
-			ui.fug_polarity->setSource("kg05/mod/modtiming_kg05.03/FugPolarity");
+			ui.fug_begin->setSource("kst/modmodtiming_kst.01/FugBegin");
+			ui.fug_width->setSource("kst/modmodtiming_kst.01/FugWidth");
+			ui.fug_polarity->setSource("kst/modmodtiming_kst.01/FugPolarity");
 			ui.RnmMode->setSource("kst/mod/llrf_kst.01/RnmMode");
 			ui.RnmMode->setTargets("kst/mod/llrf_kst.01/RnmMode");
 			ui.tertiaryLabel->show();
@@ -1318,12 +1281,12 @@ super::super(QWidget *parent) : QWidget(parent)
 			if (llrfServer) {delete llrfServer; llrfServer = 0;}
 			connectDevice("kst/mod/llrf_kst.01", &llrfServer);
 			if (timingServer) {delete timingServer; timingServer = 0;}
-			connectDevice("kg05/mod/modtiming_kg05.03", &timingServer);
+			connectDevice("kst/modmodtiming_kst.01", &timingServer);
 			if (hvServer) {delete hvServer; hvServer = 0;}
 			connectDevice("kst/mod/hv", &hvServer);
 			if (condServer) {delete condServer; condServer = 0;}
-			connectDevice("kg05/mod/modcond_kg05.03", &condServer);
-			ui.ResetInterlock->setTargets("kg05/mod/modtiming_kg05.03->Reset;f/interlock/modk16->Acknowledge");
+			connectDevice("kst/modmodcond_kst.01", &condServer);
+			ui.ResetInterlock->setTargets("kst/modmodtiming_kst.01->Reset;f/interlock/modk16->Acknowledge");
 		}
 		else if (!modNum.compare("16")) {
 			// kst/interlock/mod_kst -> f/interlock/modk16
@@ -1356,7 +1319,7 @@ super::super(QWidget *parent) : QWidget(parent)
 			ui.Standby_Led->setSource("k16/mod/general/Standby");
 			ui.LowPower_Led->setSource("k16/mod/general/LowPower");
 			ui.FullPower_Led->setSource("k16/mod/general/FullPower");
-			// ui.peakI_2->setSource("k16/mod/scopemod_kg05.03/C1TOP");
+			// ui.peakI_2->setSource("k16/mod/scopemod_kst.01/C1TOP");
 			ui.peakI_2->unsetSource(); ui.peakI_2->setText(" ");
 			ui.voltage_Scalar_2->setSource("k16/mod/hv/Voltage");
 			ui.TimeToGo_Viewer->setSource("k16/mod/general/TimeString");
@@ -1418,7 +1381,7 @@ super::super(QWidget *parent) : QWidget(parent)
 			ui.RfOff->setTargets("k16/mod/modtiming->RfOff");
 			// ui.RfOn->setTargets("k16/mod/modtiming->RfOn;kst/interlock/mod_kst->Ackmod");
 			ui.RfOn->setTargets("k16/mod/modtiming->RfOn");
-			ui.klyfil_state_k4->setSource("kg05/power_supply/psklyfil_kg05.03/State");
+			ui.klyfil_state_k4->setSource("kst/power_supply/psklyfil_kst.01/State"); // renaming
 			ui.RfRev->setSource("k16/mod/llrf_k16.01/RfReverse");
 			ui.RfRevEnable->hide();
 
@@ -1545,88 +1508,88 @@ super::super(QWidget *parent) : QWidget(parent)
 		}
 		else if (!modNum.compare("05")) {
 			// main tab
-			ui.phi_a->setSource("kg"+modNum+"/mod/rfamp_kg"+modNum+".01/KlystronPhase");
-			ui.phi_r->setSource("kg"+modNum+"/mod/rfamp_kg"+modNum+".01/KlystronPhaseRelative");
-			ui.phi_a_set->setTargets("kg"+modNum+"/mod/rfamp_kg"+modNum+".01/KlystronPhase");
-			ui.phi_r_set->setTargets("kg"+modNum+"/mod/rfamp_kg"+modNum+".01/KlystronPhaseRelative");
-			ui.reset_phi->setTargets("kg"+modNum+"/mod/rfamp_kg"+modNum+".01->ResetKlystronPhase");
-			ui.voltageSet_Scalar_2->setSource("kg"+modNum+"/mod/hv_kg"+modNum+".01/VoltageSet");
-			ui.setVlt->setTargets("kg"+modNum+"/mod/hv_kg"+modNum+".01/VoltageSet");
-			ui.power->setSource("kg"+modNum+"/mod/llrf_kg"+modNum+".01/amp_cav");
-			ui.power_2->setSource("kg"+modNum+"/mod/llrf_kg"+modNum+".01/cav_amp_set");
-			ui.setPower->setTargets("kg"+modNum+"/mod/llrf_kg"+modNum+".01/cav_amp_set");
+			ui.phi_a->setSource("k"+modNum+"/mod/rfamp_k"+modNum+".01/KlystronPhase");
+			ui.phi_r->setSource("k"+modNum+"/mod/rfamp_k"+modNum+".01/KlystronPhaseRelative");
+			ui.phi_a_set->setTargets("k"+modNum+"/mod/rfamp_k"+modNum+".01/KlystronPhase");
+			ui.phi_r_set->setTargets("k"+modNum+"/mod/rfamp_k"+modNum+".01/KlystronPhaseRelative");
+			ui.reset_phi->setTargets("k"+modNum+"/mod/rfamp_k"+modNum+".01->ResetKlystronPhase");
+			ui.voltageSet_Scalar_2->setSource("k"+modNum+"/mod/hv_k"+modNum+".01/VoltageSet");
+			ui.setVlt->setTargets("k"+modNum+"/mod/hv_k"+modNum+".01/VoltageSet");
+			ui.power->setSource("k"+modNum+"/mod/llrf_k"+modNum+".01/amp_cav");
+			ui.power_2->setSource("k"+modNum+"/mod/llrf_k"+modNum+".01/cav_amp_set");
+			ui.setPower->setTargets("k"+modNum+"/mod/llrf_k"+modNum+".01/cav_amp_set");
 
 			// general (switch) tab
-			ui.ButtonOff->setTargets("kg"+modNum+"/mod/general_kg"+modNum+".01->CmdOff");
-			ui.ButtonHeated->setTargets("kg"+modNum+"/mod/general_kg"+modNum+".01->CmdHeated");
-			ui.ButtonStandby->setTargets("kg"+modNum+"/mod/general_kg"+modNum+".01->CmdStandby");
-			ui.ButtonLowPower->setTargets("kg"+modNum+"/mod/general_kg"+modNum+".01->CmdLowPower");
-			ui.ButtonFullPower->setTargets("kg"+modNum+"/mod/modcond_kg"+modNum+".01->On");
-			ui.OFF_Led->setSource("kg"+modNum+"/mod/general_kg"+modNum+".01/Off");
-			ui.Heated_Led->setSource("kg"+modNum+"/mod/general_kg"+modNum+".01/Heated");
-			ui.Standby_Led->setSource("kg"+modNum+"/mod/general_kg"+modNum+".01/Standby");
-			ui.LowPower_Led->setSource("kg"+modNum+"/mod/general_kg"+modNum+".01/LowPower");
-			ui.FullPower_Led->setSource("kg"+modNum+"/mod/general_kg"+modNum+".01/FullPower");
-			ui.peakI_2->setSource("kg"+modNum+"/mod/scopemod_kg"+modNum+".01/C1TOP");
-			ui.voltage_Scalar_2->setSource("kg"+modNum+"/mod/hv_kg"+modNum+".01/Voltage");
-			ui.TimeToGo_Viewer->setSource("kg"+modNum+"/mod/general_kg"+modNum+".01/TimeString");
-			ui.Interlock_Led->setSource("kg"+modNum+"/mod/general_kg"+modNum+".01/Interlock");
-			ui.Timing_Led->setSource("kg"+modNum+"/mod/modtiming_kg"+modNum+".01/RfBeginEnab");
-			ui.Rfamp_Led->setSource("kg"+modNum+"/mod/rfamp_kg"+modNum+".01/IsOn");
-			ui.Fault_Viewer->setSource("kg"+modNum+"/mod/super_kg"+modNum+".01/ReadLastError");
-			ui.ButtonFaultAck->setTargets("kg"+modNum+"/mod/super_kg"+modNum+".01->Reset");
+			ui.ButtonOff->setTargets("k"+modNum+"/mod/general_k"+modNum+".01->CmdOff");
+			ui.ButtonHeated->setTargets("k"+modNum+"/mod/general_k"+modNum+".01->CmdHeated");
+			ui.ButtonStandby->setTargets("k"+modNum+"/mod/general_k"+modNum+".01->CmdStandby");
+			ui.ButtonLowPower->setTargets("k"+modNum+"/mod/general_k"+modNum+".01->CmdLowPower");
+			ui.ButtonFullPower->setTargets("k"+modNum+"/mod/modcond_k"+modNum+".01->On");
+			ui.OFF_Led->setSource("k"+modNum+"/mod/general_k"+modNum+".01/Off");
+			ui.Heated_Led->setSource("k"+modNum+"/mod/general_k"+modNum+".01/Heated");
+			ui.Standby_Led->setSource("k"+modNum+"/mod/general_k"+modNum+".01/Standby");
+			ui.LowPower_Led->setSource("k"+modNum+"/mod/general_k"+modNum+".01/LowPower");
+			ui.FullPower_Led->setSource("k"+modNum+"/mod/general_k"+modNum+".01/FullPower");
+			ui.peakI_2->setSource("k"+modNum+"/mod/scope_k"+modNum+".01/C1TOP");
+			ui.voltage_Scalar_2->setSource("k"+modNum+"/mod/hv_k"+modNum+".01/Voltage");
+			ui.TimeToGo_Viewer->setSource("k"+modNum+"/mod/general_k"+modNum+".01/TimeString");
+			ui.Interlock_Led->setSource("k"+modNum+"/mod/general_k"+modNum+".01/Interlock");
+			ui.Timing_Led->setSource("k"+modNum+"/mod/modtiming_k"+modNum+".01/RfBeginEnab");
+			ui.Rfamp_Led->setSource("k"+modNum+"/mod/rfamp_k"+modNum+".01/IsOn");
+			ui.Fault_Viewer->setSource("k"+modNum+"/mod/super_k"+modNum+".01/ReadLastError");
+			ui.ButtonFaultAck->setTargets("k"+modNum+"/mod/super_k"+modNum+".01->Reset");
 
 			// HV tab
-			ui.Ross_ON->setTargets("kg"+modNum+"/mod/ross_kg"+modNum+".01->On");
-			ui.Ross_Ground->setTargets("kg"+modNum+"/mod/hv_kg"+modNum+".01->Off;kg"+modNum+"/mod/ross_kg"+modNum+".01->Off");
-			ui.Ross_Position->setSource("kg"+modNum+"/mod/ross_kg"+modNum+".01/Position");
+			ui.Ross_ON->setTargets("k"+modNum+"/mod/ross_k"+modNum+".01->On");
+			ui.Ross_Ground->setTargets("k"+modNum+"/mod/hv_k"+modNum+".01->Off;k"+modNum+"/mod/ross_k"+modNum+".01->Off");
+			ui.Ross_Position->setSource("k"+modNum+"/mod/ross_k"+modNum+".01/Position");
 			ui.Ross_Interlock_Enable->setSource("f/interlock/mod"+modNum+"/StatHvEnable");
 			ui.Ross_Interlock_Enable->setDisplayMask(QList<unsigned>() << 5);
 			ui.Ross_Acs_Enable->setDisplayMask(QList<unsigned>() << modNum.toUInt());
-			ui.HV_ON->setTargets("kg"+modNum+"/mod/ross_kg"+modNum+".01->On;kg"+modNum+"/mod/hv_kg"+modNum+".01->ON");
-			ui.HV_OFF->setTargets("kg"+modNum+"/mod/hv_kg"+modNum+".01->Off");
-			ui.LowPowerStat->setSource("kg"+modNum+"/mod/hv_kg"+modNum+".01/LowPowerStat");
-			ui.voltage_Scalar->setSource("kg"+modNum+"/mod/hv_kg"+modNum+".01/Voltage");
-			ui.voltageSet_Scalar->setSource("kg"+modNum+"/mod/hv_kg"+modNum+".01/VoltageSet");
-			ui.setVlt_ApplyNumeric->setTargets("kg"+modNum+"/mod/hv_kg"+modNum+".01/VoltageSet");
-			ui.current_Scalar->setSource("kg"+modNum+"/mod/hv_kg"+modNum+".01/Current");
-			ui.currentSet_Scalar->setSource("kg"+modNum+"/mod/hv_kg"+modNum+".01/CurrentSet");
-			ui.setCur_ApplyNumeric->setTargets("kg"+modNum+"/mod/hv_kg"+modNum+".01/CurrentSet");
-			ui.RampUp_PushButton_2->setTargets("kg"+modNum+"/mod/modcond_kg"+modNum+".01->On");
-			ui.rampStat->setSource("kg"+modNum+"/mod/hv_kg"+modNum+".01/RampStat");
-			ui.timeToFullPower_Scalar->setSource("kg"+modNum+"/mod/general_kg"+modNum+".01/TimeString");
-			ui.Stop_PushButton_2->setTargets("kg"+modNum+"/mod/ross_kg"+modNum+".01->Stop;kg"+modNum+"/mod/hv_kg"+modNum+".01->Stop");
+			ui.HV_ON->setTargets("k"+modNum+"/mod/ross_k"+modNum+".01->On;k"+modNum+"/mod/hv_k"+modNum+".01->ON");
+			ui.HV_OFF->setTargets("k"+modNum+"/mod/hv_k"+modNum+".01->Off");
+			ui.LowPowerStat->setSource("k"+modNum+"/mod/hv_k"+modNum+".01/LowPowerStat");
+			ui.voltage_Scalar->setSource("k"+modNum+"/mod/hv_k"+modNum+".01/Voltage");
+			ui.voltageSet_Scalar->setSource("k"+modNum+"/mod/hv_k"+modNum+".01/VoltageSet");
+			ui.setVlt_ApplyNumeric->setTargets("k"+modNum+"/mod/hv_k"+modNum+".01/VoltageSet");
+			ui.current_Scalar->setSource("k"+modNum+"/mod/hv_k"+modNum+".01/Current");
+			ui.currentSet_Scalar->setSource("k"+modNum+"/mod/hv_k"+modNum+".01/CurrentSet");
+			ui.setCur_ApplyNumeric->setTargets("k"+modNum+"/mod/hv_k"+modNum+".01/CurrentSet");
+			ui.RampUp_PushButton_2->setTargets("k"+modNum+"/mod/modcond_k"+modNum+".01->On");
+			ui.rampStat->setSource("k"+modNum+"/mod/hv_k"+modNum+".01/RampStat");
+			ui.timeToFullPower_Scalar->setSource("k"+modNum+"/mod/general_k"+modNum+".01/TimeString");
+			ui.Stop_PushButton_2->setTargets("k"+modNum+"/mod/ross_k"+modNum+".01->Stop;k"+modNum+"/mod/hv_k"+modNum+".01->Stop");
 
 			// Ramp tab
-			ui.default_ramp->setSource("kg"+modNum+"/mod/hv_kg"+modNum+".01/getDefaultRamp");
-			ui.ButtonFullPower_2->setTargets("kg"+modNum+"/mod/modcond_kg"+modNum+".01->On");
-			ui.rampDown_ApplyNumeric->setTargets("kg"+modNum+"/mod/hv_kg"+modNum+".01->RampDown");
-			ui.Conditioning_State->setSource("kg"+modNum+"/mod/modcond_kg"+modNum+".01/State");
+			ui.default_ramp->setSource("k"+modNum+"/mod/hv_k"+modNum+".01/getDefaultRamp");
+			ui.ButtonFullPower_2->setTargets("k"+modNum+"/mod/modcond_k"+modNum+".01->On");
+			ui.rampDown_ApplyNumeric->setTargets("k"+modNum+"/mod/hv_k"+modNum+".01->RampDown");
+			ui.Conditioning_State->setSource("k"+modNum+"/mod/modcond_k"+modNum+".01/State");
 
 			// Timing tab
-			ui.ThyratronEnable->setSource("kg"+modNum+"/mod/modtiming_kg"+modNum+".01/ThyratronEnab");
-			ui.Thyratron->setSource("kg"+modNum+"/mod/modtiming_kg"+modNum+".01/Thyratron");
-			ui.ThyratronSet->setTargets("kg"+modNum+"/mod/modtiming_kg"+modNum+".01/Thyratron");
+			ui.ThyratronEnable->setSource("k"+modNum+"/mod/modtiming_k"+modNum+".01/ThyratronEnab");
+			ui.Thyratron->setSource("k"+modNum+"/mod/modtiming_k"+modNum+".01/Thyratron");
+			ui.ThyratronSet->setTargets("k"+modNum+"/mod/modtiming_k"+modNum+".01/Thyratron");
 			ui.OfflineMode->setSource("f/timing/rttrigger_mod_kg"+modNum+".01/EnableStaticTriggerShift");
 			ui.OfflineMode->setTargets("f/timing/rttrigger_mod_kg"+modNum+".01/EnableStaticTriggerShift");
-			ui.RfWidthEnable->setSource("kg"+modNum+"/mod/llrf_kg"+modNum+".01/pulse_state");
-			ui.RfWidth->setSource("kg"+modNum+"/mod/llrf_kg"+modNum+".01/RfLength");
-			ui.RfWidthSet->setTargets("kg"+modNum+"/mod/llrf_kg"+modNum+".01/RfLength");
-			ui.RfEndEnable->setSource("kg"+modNum+"/mod/llrf_kg"+modNum+".01/pulse_state");
-			ui.RfEnd->setSource("kg"+modNum+"/mod/llrf_kg"+modNum+".01/RfEnd");
-			ui.RfEndSet->setTargets("kg"+modNum+"/mod/llrf_kg"+modNum+".01/RfEnd");
-			ui.ThyratronInterlock->setSource("kg"+modNum+"/mod/modtiming_kg"+modNum+".01/HvFault");
-			ui.RfInterlock->setSource("kg"+modNum+"/mod/llrf_kg"+modNum+".01/Interlock_state");
-			ui.ResetInterlock->setTargets("kg"+modNum+"/mod/llrf_kg"+modNum+".01->ResetInterlock;kg"+modNum+"/mod/modtiming_kg"+modNum+".01->Reset;f/interlock/mod"+modNum+"->Acknowledge");
+			ui.RfWidthEnable->setSource("k"+modNum+"/mod/llrf_k"+modNum+".01/pulse_state");
+			ui.RfWidth->setSource("k"+modNum+"/mod/llrf_k"+modNum+".01/RfLength");
+			ui.RfWidthSet->setTargets("k"+modNum+"/mod/llrf_k"+modNum+".01/RfLength");
+			ui.RfEndEnable->setSource("k"+modNum+"/mod/llrf_k"+modNum+".01/pulse_state");
+			ui.RfEnd->setSource("k"+modNum+"/mod/llrf_k"+modNum+".01/RfEnd");
+			ui.RfEndSet->setTargets("k"+modNum+"/mod/llrf_k"+modNum+".01/RfEnd");
+			ui.ThyratronInterlock->setSource("k"+modNum+"/mod/modtiming_k"+modNum+".01/HvFault");
+			ui.RfInterlock->setSource("k"+modNum+"/mod/llrf_k"+modNum+".01/Interlock_state");
+			ui.ResetInterlock->setTargets("k"+modNum+"/mod/llrf_k"+modNum+".01->ResetInterlock;k"+modNum+"/mod/modtiming_k"+modNum+".01->Reset;f/interlock/mod"+modNum+"->Acknowledge");
 			ui.rfReverseAB_2->setNumColumns(2);
 			ui.rfReverseAB_2->setDisplayMask("2,3");
 			ui.rfReverseAB_2->setSource("f/interlock/mod"+modNum+"/StatRfTrigger");
-			ui.ThyratronOn->setTargets("kg"+modNum+"/mod/modtiming_kg"+modNum+".01->ThyMeaOn");
-			ui.ThyratronOff->setTargets("kg"+modNum+"/mod/modtiming_kg"+modNum+".01->ThyMeaOff");
-			ui.Rfamp_Led_2->setSource("kg"+modNum+"/mod/rfamp_kg"+modNum+".01/IsOn");
-			ui.rfamp_reset_2->setTargets("kg"+modNum+"/mod/rfamp_kg"+modNum+".01->ResetReversePower");
-			ui.RfOff->setTargets("kg"+modNum+"/mod/modtiming_kg"+modNum+".01->RfOff");
-			ui.RfOn->setTargets("kg"+modNum+"/mod/modtiming_kg"+modNum+".01->RfOn;f/interlock/mod"+modNum+"->Ackmod");
+			ui.ThyratronOn->setTargets("k"+modNum+"/mod/modtiming_k"+modNum+".01->ThyMeaOn");
+			ui.ThyratronOff->setTargets("k"+modNum+"/mod/modtiming_k"+modNum+".01->ThyMeaOff");
+			ui.Rfamp_Led_2->setSource("k"+modNum+"/mod/rfamp_k"+modNum+".01/IsOn");
+			ui.rfamp_reset_2->setTargets("k"+modNum+"/mod/rfamp_k"+modNum+".01->ResetReversePower");
+			ui.RfOff->setTargets("k"+modNum+"/mod/modtiming_k"+modNum+".01->RfOff");
+			ui.RfOn->setTargets("k"+modNum+"/mod/modtiming_k"+modNum+".01->RfOn;f/interlock/mod"+modNum+"->Ackmod");
 
 			// Filaments tab
 			ui.thyfil_enable->setSource("f/interlock/mod"+modNum+"/StatHvEnable");
@@ -1637,22 +1600,22 @@ super::super(QWidget *parent) : QWidget(parent)
 			ui.klyfil_enable->setDisplayMask("9");
 			ui.klyfil_psk_stat->setSource("f/interlock/mod"+modNum+"/StatHvEnable");
 			// ui.klyfil_psk_stat->setDisplayMask("8");
-			ui.thyfil_vlt->setSource("kg"+modNum+"/mod/thyfil_kg"+modNum+".01/Voltage");
-			ui.thyfil_cur->setSource("kg"+modNum+"/mod/thyfil_kg"+modNum+".01/Current");
-			ui.thyfil_off->setTargets("kg"+modNum+"/mod/thyfil_kg"+modNum+".01->Off");
-			ui.thyfil_isOff->setSource("kg"+modNum+"/mod/thyfil_kg"+modNum+".01/IsOff");
-			ui.thyfil_on->setTargets("kg"+modNum+"/mod/thyfil_kg"+modNum+".01->On");
-			ui.thyfil_isOn->setSource("kg"+modNum+"/mod/thyfil_kg"+modNum+".01/IsOn");
-			ui.thyfil_reset->setTargets("kg"+modNum+"/mod/thyfil_kg"+modNum+".01->Reset");
-			ui.klyfil_vlt->setSource("kg"+modNum+"/mod/klyfil_kg"+modNum+".01/Voltage");
-			ui.klyfil_cur->setSource("kg"+modNum+"/mod/klyfil_kg"+modNum+".01/Current");
-			ui.klyfil_off->setTargets("kg"+modNum+"/mod/klyfil_kg"+modNum+".01->Off");
-			ui.klyfil_isOff->setSource("kg"+modNum+"/mod/klyfil_kg"+modNum+".01/IsOff");
-			ui.klyfil_80->setTargets("kg"+modNum+"/mod/klyfil_kg"+modNum+".01->Standby");
-			ui.klyfil_is80->setSource("kg"+modNum+"/mod/klyfil_kg"+modNum+".01/Is80");
-			ui.klyfil_100->setTargets("kg"+modNum+"/mod/klyfil_kg"+modNum+".01->On");
-			ui.klyfil_is100->setSource("kg"+modNum+"/mod/klyfil_kg"+modNum+".01/Is100");
-			ui.klyfil_reset->setTargets("kg"+modNum+"/mod/klyfil_kg"+modNum+".01->Reset");
+			ui.thyfil_vlt->setSource("k"+modNum+"/mod/thyfil_k"+modNum+".01/Voltage");
+			ui.thyfil_cur->setSource("k"+modNum+"/mod/thyfil_k"+modNum+".01/Current");
+			ui.thyfil_off->setTargets("k"+modNum+"/mod/thyfil_k"+modNum+".01->Off");
+			ui.thyfil_isOff->setSource("k"+modNum+"/mod/thyfil_k"+modNum+".01/IsOff");
+			ui.thyfil_on->setTargets("k"+modNum+"/mod/thyfil_k"+modNum+".01->On");
+			ui.thyfil_isOn->setSource("k"+modNum+"/mod/thyfil_k"+modNum+".01/IsOn");
+			ui.thyfil_reset->setTargets("k"+modNum+"/mod/thyfil_k"+modNum+".01->Reset");
+			ui.klyfil_vlt->setSource("k"+modNum+"/mod/klyfil_k"+modNum+".01/Voltage");
+			ui.klyfil_cur->setSource("k"+modNum+"/mod/klyfil_k"+modNum+".01/Current");
+			ui.klyfil_off->setTargets("k"+modNum+"/mod/klyfil_k"+modNum+".01->Off");
+			ui.klyfil_isOff->setSource("k"+modNum+"/mod/klyfil_k"+modNum+".01/IsOff");
+			ui.klyfil_80->setTargets("k"+modNum+"/mod/klyfil_k"+modNum+".01->Standby");
+			ui.klyfil_is80->setSource("k"+modNum+"/mod/klyfil_k"+modNum+".01/Is80");
+			ui.klyfil_100->setTargets("k"+modNum+"/mod/klyfil_k"+modNum+".01->On");
+			ui.klyfil_is100->setSource("k"+modNum+"/mod/klyfil_k"+modNum+".01/Is100");
+			ui.klyfil_reset->setTargets("k"+modNum+"/mod/klyfil_k"+modNum+".01->Reset");
 			ui.klyfil4_80->hide();
 			// restore widgets customized by mod 4
 			ui.klyfil_enable->show();
@@ -1670,20 +1633,20 @@ super::super(QWidget *parent) : QWidget(parent)
 			ui.kly_vac_fault->setDisplayMask("3");
 			ui.piri_a_fault->setDisplayMask("4");
 			ui.piri_b_fault->setDisplayMask("5");
-			ui.premag_cur->setSource("kg"+modNum+"/mod/premag_kg"+modNum+".01/Current");
-			ui.premag_off->setTargets("kg"+modNum+"/mod/premag_kg"+modNum+".01->Off");
-			ui.premag_on->setTargets("kg"+modNum+"/mod/premag_kg"+modNum+".01->On");
-			ui.premag_stat->setSource("kg"+modNum+"/mod/premag_kg"+modNum+".01/State");
+			ui.premag_cur->setSource("k"+modNum+"/mod/premag_k"+modNum+".01/Current");
+			ui.premag_off->setTargets("k"+modNum+"/mod/premag_k"+modNum+".01->Off");
+			ui.premag_on->setTargets("k"+modNum+"/mod/premag_k"+modNum+".01->On");
+			ui.premag_stat->setSource("k"+modNum+"/mod/premag_k"+modNum+".01/State");
 			ui.kly_vac_fault->setSource("f/interlock/mod"+modNum+"/StatThyTriggerEnable");
 			ui.piri_a_fault->setSource("f/interlock/mod"+modNum+"/StatThyTriggerEnable");
 			ui.piri_b_fault->setSource("f/interlock/mod"+modNum+"/StatThyTriggerEnable");
-			ui.reset_piri->setTargets("kg"+modNum+"/mod/rfamp_kg"+modNum+".01->ResetPiri");
-			ui.vacuumKly->setSource("kg"+modNum+"/mod/klyfil_kg"+modNum+".01/KlystronPressure");
-			ui.vacuumKlyInt->setSource("kg"+modNum+"/mod/klyfil_kg"+modNum+".01/KlystronPressureIntegrated");
-			ui.KlyCollTemp->setSource("kg"+modNum+"/mod/klyfil_kg"+modNum+".01/KlystronCollectorTemperature");
-			ui.peakI->setSource("kg"+modNum+"/mod/scopemod_kg"+modNum+".01/C1TOP");
-			ui.revI->setSource("kg"+modNum+"/mod/scopemod_kg"+modNum+".01/C1PKPK");
-			ui.reset_pi->setTargets("kg"+modNum+"/mod/klyfil_kg"+modNum+".01->ResetIonicPump");
+			ui.reset_piri->setTargets("k"+modNum+"/mod/rfamp_k"+modNum+".01->ResetPiri");
+			ui.vacuumKly->setSource("k"+modNum+"/mod/klyfil_k"+modNum+".01/KlystronPressure");
+			ui.vacuumKlyInt->setSource("k"+modNum+"/mod/klyfil_k"+modNum+".01/KlystronPressureIntegrated");
+			ui.KlyCollTemp->setSource("k"+modNum+"/mod/klyfil_k"+modNum+".01/KlystronCollectorTemperature");
+			ui.peakI->setSource("k"+modNum+"/mod/scope_k"+modNum+".01/C1TOP");
+			ui.revI->setSource("k"+modNum+"/mod/scope_k"+modNum+".01/C1PKPK");
+			ui.reset_pi->setTargets("k"+modNum+"/mod/klyfil_k"+modNum+".01->ResetIonicPump");
 
 			// SF6 tab
 			ui.SF6Press->setSource("f/interlock/sf6_"+modNum+"/SF6Press");
@@ -1699,40 +1662,40 @@ super::super(QWidget *parent) : QWidget(parent)
 			ui.frame_sf6_ctf->hide();
 
 			// Misc tab
-			ui.repetition_rate->setSource("kg05/mod/modfreq_kg05.01/Frequency");
-			cmd_rfamp_on->setTargets("kg"+modNum+"/mod/rfamp_kg"+modNum+".01->On");
-			cmd_rfamp_off->setTargets("kg"+modNum+"/mod/rfamp_kg"+modNum+".01->Off");
-			ui.rfamp_stat->setSource("kg"+modNum+"/mod/rfamp_kg"+modNum+".01/IsOn");
-			ui.rfamp_reset->setTargets("kg"+modNum+"/mod/rfamp_kg"+modNum+".01->ResetReversePower");
+			ui.repetition_rate->setSource("k"+modNum+"/mod/modfreq_k"+modNum+".01/Frequency");
+			cmd_rfamp_on->setTargets("k"+modNum+"/mod/rfamp_k"+modNum+".01->On");
+			cmd_rfamp_off->setTargets("k"+modNum+"/mod/rfamp_k"+modNum+".01->Off");
+			ui.rfamp_stat->setSource("k"+modNum+"/mod/rfamp_k"+modNum+".01/IsOn");
+			ui.rfamp_reset->setTargets("k"+modNum+"/mod/rfamp_k"+modNum+".01->ResetReversePower");
 			ui.rfReverseAB->setNumColumns(modNum.toInt()==4? 1: 2);
 			// ui.rfReverseAB->setDisplayMask(modNum.toInt()<3? "4,5": (modNum.toInt()==4? "12": "4,5"));
 			ui.rfReverseAB->setDisplayMask(modNum.toInt()<3? "3,4": (modNum.toInt()==4? "12": "2,3"));
 			ui.rfReverseAB->setSource("f/interlock/mod"+modNum+"/StatRfTrigger");
 			ui.rfReverseAB->setTrueColors(ui.rfReverseAB_2->trueColors());
-			ui.foc_stat_1->setSource("kg"+modNum+"/power_supply/psklyfoc_kg"+modNum+".01/State");
-			ui.foc_stat_2->setSource("kg"+modNum+"/power_supply/psklyfoc_kg"+modNum+".02/State");
-			ui.foc_stat_3->setSource("kg"+modNum+"/power_supply/psklyfoc_kg"+modNum+".03/State");
-			ui.foc_off->setTargets("kg"+modNum+"/power_supply/psklyfoc_kg"+modNum+".01->Off;kg"+modNum+"/power_supply/psklyfoc_kg"+modNum+".02->Off;kg"+modNum+"/power_supply/psklyfoc_kg"+modNum+".03->Off");
-			ui.foc_on->setTargets("kg"+modNum+"/power_supply/psklyfoc_kg"+modNum+".01->On;kg"+modNum+"/power_supply/psklyfoc_kg"+modNum+".02->On;kg"+modNum+"/power_supply/psklyfoc_kg"+modNum+".03->On");
+			ui.foc_stat_1->setSource("k"+modNum+"/power_supply/psklyfoc_k"+modNum+".01/State");
+			ui.foc_stat_2->setSource("k"+modNum+"/power_supply/psklyfoc_k"+modNum+".02/State");
+			ui.foc_stat_3->setSource("k"+modNum+"/power_supply/psklyfoc_k"+modNum+".03/State");
+			ui.foc_off->setTargets("k"+modNum+"/power_supply/psklyfoc_k"+modNum+".01->Off;k"+modNum+"/power_supply/psklyfoc_k"+modNum+".02->Off;k"+modNum+"/power_supply/psklyfoc_k"+modNum+".03->Off");
+			ui.foc_on->setTargets("k"+modNum+"/power_supply/psklyfoc_k"+modNum+".01->On;k"+modNum+"/power_supply/psklyfoc_k"+modNum+".02->On;k"+modNum+"/power_supply/psklyfoc_k"+modNum+".03->On");
 			ui.foc_stat_1_label->setText("1");
 			ui.foc_stat_2_label->setText("2");
 			ui.foc_stat_3_label->setText("3");
 			ui.reset_k4->setTargets("f/interlock/foc"+modNum+"->DeltaAlarmRestart");
-			ui.fug_begin->setSource("kg"+modNum+"/mod/modtiming_kg"+modNum+".01/FugBegin");
-			ui.fug_width->setSource("kg"+modNum+"/mod/modtiming_kg"+modNum+".01/FugWidth");
-			ui.fug_polarity->setSource("kg"+modNum+"/mod/modtiming_kg"+modNum+".01/FugPolarity");
-			ui.RnmMode->setSource("kg"+modNum+"/mod/llrf_kg"+modNum+".01/RnmMode");
-			ui.RnmMode->setTargets("kg"+modNum+"/mod/llrf_kg"+modNum+".01/RnmMode");
+			ui.fug_begin->setSource("k"+modNum+"/mod/modtiming_k"+modNum+".01/FugBegin");
+			ui.fug_width->setSource("k"+modNum+"/mod/modtiming_k"+modNum+".01/FugWidth");
+			ui.fug_polarity->setSource("k"+modNum+"/mod/modtiming_k"+modNum+".01/FugPolarity");
+			ui.RnmMode->setSource("k"+modNum+"/mod/llrf_k"+modNum+".01/RnmMode");
+			ui.RnmMode->setTargets("k"+modNum+"/mod/llrf_k"+modNum+".01/RnmMode");
 			ui.tertiaryLabel->show();
 			ui.tertiaryInfoButton->show();
 			if (llrfServer) {delete llrfServer; llrfServer = 0;}
-			connectDevice("kg"+modNum+"/mod/llrf_kg"+modNum+".01", &llrfServer);
+			connectDevice("k"+modNum+"/mod/llrf_k"+modNum+".01", &llrfServer);
 			if (timingServer) {delete timingServer; timingServer = 0;}
-			connectDevice("kg"+modNum+"/mod/modtiming_kg"+modNum+".01", &timingServer);
+			connectDevice("k"+modNum+"/mod/modtiming_k"+modNum+".01", &timingServer);
 			if (hvServer) {delete hvServer; hvServer = 0;}
-			connectDevice("kg"+modNum+"/mod/hv_kg"+modNum+".01", &hvServer);
+			connectDevice("k"+modNum+"/mod/hv_k"+modNum+".01", &hvServer);
 			if (condServer) {delete condServer; condServer = 0;}
-			connectDevice("kg"+modNum+"/mod/modcond_kg"+modNum+".01", &condServer);
+			connectDevice("k"+modNum+"/mod/modcond_k"+modNum+".01", &condServer);
 		}
 		else {
 			ui.SF6Press->setSource("f/interlock/sf6_"+modNum+"/SF6Press");
@@ -1750,49 +1713,47 @@ super::super(QWidget *parent) : QWidget(parent)
 			cout << "configWidgets()2b " << modNum.toStdString() << endl;
 
 			// main tab
-			ui.phi_a->setSource("kg"+modNum+"/mod/rfamp/KlystronPhase");
-			ui.phi_r->setSource("kg"+modNum+"/mod/rfamp/KlystronPhaseRelative");
-			ui.phi_a_set->setTargets("kg"+modNum+"/mod/rfamp/KlystronPhase");
-			ui.phi_r_set->setTargets("kg"+modNum+"/mod/rfamp/KlystronPhaseRelative");
-			ui.reset_phi->setTargets("kg"+modNum+"/mod/rfamp->ResetKlystronPhase");
-			ui.voltageSet_Scalar_2->setSource("kg"+modNum+"/mod/hv/VoltageSet");
-			ui.setVlt->setTargets("kg"+modNum+"/mod/hv/VoltageSet");
-			ui.power->setSource("kg"+modNum+"/mod/llrf_kg"+modNum+".01/amp_cav");
-			ui.power_2->setSource("kg"+modNum+"/mod/llrf_kg"+modNum+".01/cav_amp_set");
-			ui.setPower->setTargets("kg"+modNum+"/mod/llrf_kg"+modNum+".01/cav_amp_set");
+			ui.phi_a->setSource("k"+modNum+"/mod/rfamp_k"+modNum+".01/KlystronPhase");
+			ui.phi_r->setSource("k"+modNum+"/mod/rfamp_k"+modNum+".01/KlystronPhaseRelative");
+			ui.phi_a_set->setTargets("k"+modNum+"/mod/rfamp_k"+modNum+".01/KlystronPhase");
+			ui.phi_r_set->setTargets("k"+modNum+"/mod/rfamp_k"+modNum+".01/KlystronPhaseRelative");
+			ui.reset_phi->setTargets("k"+modNum+"/mod/rfamp_k"+modNum+".01->ResetKlystronPhase");
+			ui.voltageSet_Scalar_2->setSource("k"+modNum+"/mod/hv_k"+modNum+".01/VoltageSet");
+			ui.setVlt->setTargets("k"+modNum+"/mod/hv_k"+modNum+".01/VoltageSet");
+			ui.power->setSource("k"+modNum+"/mod/llrf_k"+modNum+".01/amp_cav");
+			ui.power_2->setSource("k"+modNum+"/mod/llrf_k"+modNum+".01/cav_amp_set");
+			ui.setPower->setTargets("k"+modNum+"/mod/llrf_k"+modNum+".01/cav_amp_set");
 
 			// general (switch) tab
-			ui.ButtonOff->setTargets("kg"+modNum+"/mod/general->CmdOff");
-			ui.ButtonHeated->setTargets("kg"+modNum+"/mod/general->CmdHeated");
-			ui.ButtonStandby->setTargets("kg"+modNum+"/mod/general->CmdStandby");
-			ui.ButtonLowPower->setTargets("kg"+modNum+"/mod/general->CmdLowPower");
-			// ui.ButtonFullPower->setTargets("kg"+modNum+"/mod/general->CmdFullPower");
-			ui.ButtonFullPower->setTargets("kg"+modNum+"/mod/modcond-kg"+modNum+"-01->On");  // 27-04-2011
-			ui.OFF_Led->setSource("kg"+modNum+"/mod/general/Off");
-			ui.Heated_Led->setSource("kg"+modNum+"/mod/general/Heated");
-			ui.Standby_Led->setSource("kg"+modNum+"/mod/general/Standby");
-			ui.LowPower_Led->setSource("kg"+modNum+"/mod/general/LowPower");
-			ui.FullPower_Led->setSource("kg"+modNum+"/mod/general/FullPower");
-
-			// --->>>> ui.Stop_Button_0->setTargets("kg"+modNum+"/mod/general->Stop;kg"+modNum+"/mod/hv->Stop");
-			ui.voltage_Scalar_2->setSource("kg"+modNum+"/mod/hv/Voltage");
-			ui.TimeToGo_Viewer->setSource("kg"+modNum+"/mod/general/TimeString");
+			ui.ButtonOff->setTargets("k"+modNum+"/mod/general_k"+modNum+".01->CmdOff");
+			ui.ButtonHeated->setTargets("k"+modNum+"/mod/general_k"+modNum+".01->CmdHeated");
+			ui.ButtonStandby->setTargets("k"+modNum+"/mod/general_k"+modNum+".01->CmdStandby");
+			ui.ButtonLowPower->setTargets("k"+modNum+"/mod/general_k"+modNum+".01->CmdLowPower");
+			// ui.ButtonFullPower->setTargets("k"+modNum+"/mod/general_k"+modNum+".01->CmdFullPower");
+			ui.ButtonFullPower->setTargets("k"+modNum+"/mod/modcond_k"+modNum+".01->On");  // 27-04-2011
+			ui.OFF_Led->setSource("k"+modNum+"/mod/general_k"+modNum+".01/Off");
+			ui.Heated_Led->setSource("k"+modNum+"/mod/general_k"+modNum+".01/Heated");
+			ui.Standby_Led->setSource("k"+modNum+"/mod/general_k"+modNum+".01/Standby");
+			ui.LowPower_Led->setSource("k"+modNum+"/mod/general_k"+modNum+".01/LowPower");
+			ui.FullPower_Led->setSource("k"+modNum+"/mod/general_k"+modNum+".01/FullPower");
+
+			ui.voltage_Scalar_2->setSource("k"+modNum+"/mod/hv_k"+modNum+".01/Voltage");
+			ui.TimeToGo_Viewer->setSource("k"+modNum+"/mod/general_k"+modNum+".01/TimeString");
 
 			// ui.Interlock_Led->setSource("f/interlock/abimod"+modNum+"/StatAbiTriggerRf");
-			ui.Interlock_Led->setSource("kg"+modNum+"/mod/general/Interlock");
-			ui.Timing_Led->setSource("kg"+modNum+"/mod/modtiming/RfBeginEnab");
-			ui.Rfamp_Led->setSource("kg"+modNum+"/mod/rfamp/IsOn");
+			ui.Interlock_Led->setSource("k"+modNum+"/mod/general_k"+modNum+".01/Interlock");
+			ui.Timing_Led->setSource("k"+modNum+"/mod/modtiming_k"+modNum+".01/RfBeginEnab");
+			ui.Rfamp_Led->setSource("k"+modNum+"/mod/rfamp_k"+modNum+".01/IsOn");
 
-			ui.Fault_Viewer->setSource("kg"+modNum+"/mod/super/ReadLastError");
-			ui.ButtonFaultAck->setTargets("kg"+modNum+"/mod/super->Reset");
+			ui.Fault_Viewer->setSource("k"+modNum+"/mod/super_k"+modNum+".01/ReadLastError");
+			ui.ButtonFaultAck->setTargets("k"+modNum+"/mod/super_k"+modNum+".01->Reset");
 
 			sleep(0.2);
 
 			// HV tab
-			// ui.Ross_ON->setTargets("kg"+modNum+"/mod/ross->On;f/interlock/mod"+modNum+"->Acknowledge");
-			ui.Ross_ON->setTargets("kg"+modNum+"/mod/ross->On");
-			ui.Ross_Ground->setTargets("kg"+modNum+"/mod/hv->Off;kg"+modNum+"/mod/ross->Off");
-			ui.Ross_Position->setSource("kg"+modNum+"/mod/ross/Position");
+			ui.Ross_ON->setTargets("k"+modNum+"/mod/ross_k"+modNum+".01->On");
+			ui.Ross_Ground->setTargets("k"+modNum+"/mod/hv_k"+modNum+".01->Off;k"+modNum+"/mod/ross_k"+modNum+".01->Off");
+			ui.Ross_Position->setSource("k"+modNum+"/mod/ross_k"+modNum+".01/Position");
 			if (!modNum.compare("sp")) {
 				ui.Ross_Interlock_Enable->setSource("f/interlock/mod00/StatHvEnable");
 			}
@@ -1803,43 +1764,41 @@ super::super(QWidget *parent) : QWidget(parent)
 
 			ui.Ross_Acs_Enable->setDisplayMask(QList<unsigned>() << modNum.toUInt());
 
-			// ui.HV_ON->setTargets("kg"+modNum+"/mod/ross->On;kg"+modNum+"/mod/hv->ON;f/interlock/mod"+modNum+"->Acknowledge");
-			ui.HV_ON->setTargets("kg"+modNum+"/mod/ross->On;kg"+modNum+"/mod/hv->ON");
-			ui.HV_OFF->setTargets("kg"+modNum+"/mod/hv->Off");
-			ui.LowPowerStat->setSource("kg"+modNum+"/mod/hv/LowPowerStat");
-			// ui.isOn->setSource("kg"+modNum+"/mod/hv/HV");
-			// ui.isEnabled->setSource("kg"+modNum+"/mod/hv/isEnabled");
-			ui.voltage_Scalar->setSource("kg"+modNum+"/mod/hv/Voltage");
-			ui.voltageSet_Scalar->setSource("kg"+modNum+"/mod/hv/VoltageSet");
-			ui.setVlt_ApplyNumeric->setTargets("kg"+modNum+"/mod/hv/VoltageSet");
-			ui.current_Scalar->setSource("kg"+modNum+"/mod/hv/Current");
-			ui.currentSet_Scalar->setSource("kg"+modNum+"/mod/hv/CurrentSet");
-			ui.setCur_ApplyNumeric->setTargets("kg"+modNum+"/mod/hv/CurrentSet");
-			// ui.RampUp_PushButton_2->setTargets("kg"+modNum+"/mod/hv->RampUp;f/interlock/mod"+modNum+"->Acknowledge");
-			// ui.RampUp_PushButton_2->setTargets("kg"+modNum+"/mod/hv->RampUp");
-			ui.RampUp_PushButton_2->setTargets("kg"+modNum+"/mod/modcond-kg"+modNum+"-01->On");
-			ui.rampStat->setSource("kg"+modNum+"/mod/hv/RampStat");
-			ui.timeToFullPower_Scalar->setSource("kg"+modNum+"/mod/general/TimeString");
-			ui.Stop_PushButton_2->setTargets("kg"+modNum+"/mod/ross->Stop;kg"+modNum+"/mod/hv->Stop");
+			ui.HV_ON->setTargets("k"+modNum+"/mod/ross_k"+modNum+".01->On;k"+modNum+"/mod/hv_k"+modNum+".01->ON");
+			ui.HV_OFF->setTargets("k"+modNum+"/mod/hv_k"+modNum+".01->Off");
+			ui.LowPowerStat->setSource("k"+modNum+"/mod/hv_k"+modNum+".01/LowPowerStat");
+			// ui.isOn->setSource("k"+modNum+"/mod/hv_k"+modNum+".01/HV");
+			// ui.isEnabled->setSource("k"+modNum+"/mod/hv_k"+modNum+".01/isEnabled");
+			ui.voltage_Scalar->setSource("k"+modNum+"/mod/hv_k"+modNum+".01/Voltage");
+			ui.voltageSet_Scalar->setSource("k"+modNum+"/mod/hv_k"+modNum+".01/VoltageSet");
+			ui.setVlt_ApplyNumeric->setTargets("k"+modNum+"/mod/hv_k"+modNum+".01/VoltageSet");
+			ui.current_Scalar->setSource("k"+modNum+"/mod/hv_k"+modNum+".01/Current");
+			ui.currentSet_Scalar->setSource("k"+modNum+"/mod/hv_k"+modNum+".01/CurrentSet");
+			ui.setCur_ApplyNumeric->setTargets("k"+modNum+"/mod/hv_k"+modNum+".01/CurrentSet");
+			// ui.RampUp_PushButton_2->setTargets("k"+modNum+"/mod/hv_k"+modNum+".01->RampUp;f/interlock/mod"+modNum+"->Acknowledge");
+			// ui.RampUp_PushButton_2->setTargets("k"+modNum+"/mod/hv_k"+modNum+".01->RampUp");
+			ui.RampUp_PushButton_2->setTargets("k"+modNum+"/mod/modcond_k"+modNum+".01->On");
+			ui.rampStat->setSource("k"+modNum+"/mod/hv_k"+modNum+".01/RampStat");
+			ui.timeToFullPower_Scalar->setSource("k"+modNum+"/mod/general_k"+modNum+".01/TimeString");
+			ui.Stop_PushButton_2->setTargets("k"+modNum+"/mod/ross_k"+modNum+".01->Stop;k"+modNum+"/mod/hv_k"+modNum+".01->Stop");
 
 			// Ramp tab
-			ui.default_ramp->setSource("kg"+modNum+"/mod/hv/getDefaultRamp");
-			// ui.ButtonFullPower_2->setTargets("kg"+modNum+"/mod/hv->RampUp;f/interlock/mod"+modNum+"->Acknowledge");
-			// ui.ButtonFullPower_2->setTargets("kg"+modNum+"/mod/hv->RampUp");
-			ui.ButtonFullPower_2->setTargets("kg"+modNum+"/mod/modcond-kg"+modNum+"-01->On"); // 27-04-2011
-			// --->>>> ui.Stop_PushButton->setTargets("kg"+modNum+"/mod/hv->Stop;kg"+modNum+"/mod/ross->Stop");
-			ui.rampDown_ApplyNumeric->setTargets("kg"+modNum+"/mod/hv->RampDown");
-			ui.Conditioning_State->setSource("kg"+modNum+"/mod/modcond-kg"+modNum+"-01/State");
-			// ui.makerampV->setTargets("kg"+modNum+"/mod/hv->RampDown");
+			ui.default_ramp->setSource("k"+modNum+"/mod/hv_k"+modNum+".01/getDefaultRamp");
+			// ui.ButtonFullPower_2->setTargets("k"+modNum+"/mod/hv_k"+modNum+".01->RampUp;f/interlock/mod"+modNum+"->Acknowledge");
+			// ui.ButtonFullPower_2->setTargets("k"+modNum+"/mod/hv_k"+modNum+".01->RampUp");
+			ui.ButtonFullPower_2->setTargets("k"+modNum+"/mod/modcond_k"+modNum+".01->On"); // 27-04-2011
+			ui.rampDown_ApplyNumeric->setTargets("k"+modNum+"/mod/hv_k"+modNum+".01->RampDown");
+			ui.Conditioning_State->setSource("k"+modNum+"/mod/modcond_k"+modNum+".01/State");
+			// ui.makerampV->setTargets("k"+modNum+"/mod/hv_k"+modNum+".01->RampDown");
 
 			// Timing tab
-			ui.ThyratronEnable->setSource("kg"+modNum+"/mod/modtiming/ThyratronEnab");
-			ui.Thyratron->setSource("kg"+modNum+"/mod/modtiming/Thyratron");
-			ui.ThyratronSet->setTargets("kg"+modNum+"/mod/modtiming/Thyratron");
+			ui.ThyratronEnable->setSource("k"+modNum+"/mod/modtiming_k"+modNum+".01/ThyratronEnab");
+			ui.Thyratron->setSource("k"+modNum+"/mod/modtiming_k"+modNum+".01/Thyratron");
+			ui.ThyratronSet->setTargets("k"+modNum+"/mod/modtiming_k"+modNum+".01/Thyratron");
 
-			ui.RfWidthEnable->setSource("kg"+modNum+"/mod/llrf_kg"+modNum+".01/pulse_state");
-			ui.RfWidth->setSource("kg"+modNum+"/mod/llrf_kg"+modNum+".01/RfLength");
-			ui.RfWidthSet->setTargets("kg"+modNum+"/mod/llrf_kg"+modNum+".01/RfLength");
+			ui.RfWidthEnable->setSource("k"+modNum+"/mod/llrf_k"+modNum+".01/pulse_state");
+			ui.RfWidth->setSource("k"+modNum+"/mod/llrf_k"+modNum+".01/RfLength");
+			ui.RfWidthSet->setTargets("k"+modNum+"/mod/llrf_k"+modNum+".01/RfLength");
 			if (!modNum.compare("sp")) {
 				ui.OfflineMode->setSource("f/timing/rttrigger_mod_kg00.01/EnableStaticTriggerShift");
 				ui.OfflineMode->setTargets("f/timing/rttrigger_mod_kg00.01/EnableStaticTriggerShift");
@@ -1848,12 +1807,12 @@ super::super(QWidget *parent) : QWidget(parent)
 				ui.OfflineMode->setSource("f/timing/rttrigger_mod_kg"+modNum+".01/EnableStaticTriggerShift");
 				ui.OfflineMode->setTargets("f/timing/rttrigger_mod_kg"+modNum+".01/EnableStaticTriggerShift");
 			}
-			// ui.RfWidthEnable->setSource("kg"+modNum+"/mod/modtiming/RfBeginEnab");
-			// ui.RfWidth->setSource("kg"+modNum+"/mod/modtiming/RfWidth");
-			// ui.RfWidthSet->setTargets("kg"+modNum+"/mod/modtiming/RfWidth");
-			// ui.RfBeginEnable->setSource("kg"+modNum+"/mod/modtiming/RfBeginEnab");
-			// ui.RfBegin->setSource("kg"+modNum+"/mod/modtiming/RfWidth");
-			// ui.RfBeginSet->setTargets("kg"+modNum+"/mod/modtiming/RfWidth");
+			// ui.RfWidthEnable->setSource("k"+modNum+"/mod/modtiming_k"+modNum+".01/RfBeginEnab");
+			// ui.RfWidth->setSource("k"+modNum+"/mod/modtiming_k"+modNum+".01/RfWidth");
+			// ui.RfWidthSet->setTargets("k"+modNum+"/mod/modtiming_k"+modNum+".01/RfWidth");
+			// ui.RfBeginEnable->setSource("k"+modNum+"/mod/modtiming_k"+modNum+".01/RfBeginEnab");
+			// ui.RfBegin->setSource("k"+modNum+"/mod/modtiming_k"+modNum+".01/RfWidth");
+			// ui.RfBeginSet->setTargets("k"+modNum+"/mod/modtiming_k"+modNum+".01/RfWidth");
 
 			if (!modNum.compare("sp") || !modNum.compare("08") || !modNum.compare("09") || !modNum.compare("10") || !modNum.compare("11") || !modNum.compare("12") || !modNum.compare("13") || !modNum.compare("14") || !modNum.compare("15")) {
 				ui.RfRevEnable->show();
@@ -1861,9 +1820,9 @@ super::super(QWidget *parent) : QWidget(parent)
 				// ui.RfRevSet->show();
 				ui.rev_label->show();
 				ui.rev_unit->show();
-				ui.RfRevEnable->setSource("kg"+modNum+"/mod/llrf_kg"+modNum+".01/pulse_state");
-				ui.RfRev->setSource("kg"+modNum+"/mod/llrf_kg"+modNum+".01/RfReverse");
-				// ui.RfRevSet->setTargets("kg"+modNum+"/mod/llrf_kg"+modNum+".01/rf_sled_rev_t");
+				ui.RfRevEnable->setSource("k"+modNum+"/mod/llrf_k"+modNum+".01/pulse_state");
+				ui.RfRev->setSource("k"+modNum+"/mod/llrf_k"+modNum+".01/RfReverse");
+				// ui.RfRevSet->setTargets("k"+modNum+"/mod/llrf_k"+modNum+".01/rf_sled_rev_t");
 			}
 			else {
 				ui.RfRevEnable->hide();
@@ -1872,47 +1831,47 @@ super::super(QWidget *parent) : QWidget(parent)
 				ui.rev_label->hide();
 				ui.rev_unit->hide();
 			}
-			ui.RfEndEnable->setSource("kg"+modNum+"/mod/llrf_kg"+modNum+".01/pulse_state");
-			ui.RfEnd->setSource("kg"+modNum+"/mod/llrf_kg"+modNum+".01/RfEnd");
-			ui.RfEndSet->setTargets("kg"+modNum+"/mod/llrf_kg"+modNum+".01/RfEnd");
-			// ui.RfEndEnable->setSource("kg"+modNum+"/mod/modtiming/RfEndEnab");
-			// ui.RfEnd->setSource("kg"+modNum+"/mod/modtiming/RfEndwithWidth");
-			// ui.RfEndSet->setTargets("kg"+modNum+"/mod/modtiming/RfEndwithWidth");
-
-			ui.ThyratronInterlock->setSource("kg"+modNum+"/mod/modtiming/HvFault");
-			ui.RfInterlock->setSource("kg"+modNum+"/mod/llrf_kg"+modNum+".01/Interlock_state");
+			ui.RfEndEnable->setSource("k"+modNum+"/mod/llrf_k"+modNum+".01/pulse_state");
+			ui.RfEnd->setSource("k"+modNum+"/mod/llrf_k"+modNum+".01/RfEnd");
+			ui.RfEndSet->setTargets("k"+modNum+"/mod/llrf_k"+modNum+".01/RfEnd");
+			// ui.RfEndEnable->setSource("k"+modNum+"/mod/modtiming_k"+modNum+".01/RfEndEnab");
+			// ui.RfEnd->setSource("k"+modNum+"/mod/modtiming_k"+modNum+".01/RfEndwithWidth");
+			// ui.RfEndSet->setTargets("k"+modNum+"/mod/modtiming_k"+modNum+".01/RfEndwithWidth");
+
+			ui.ThyratronInterlock->setSource("k"+modNum+"/mod/modtiming_k"+modNum+".01/HvFault");
+			ui.RfInterlock->setSource("k"+modNum+"/mod/llrf_k"+modNum+".01/Interlock_state");
 			if (!modNum.compare("04")) {
-				ui.ResetInterlock->setTargets("kg"+modNum+"/mod/modtiming->Reset;f/interlock/mod"+modNum+"->Acknowledge");
+				ui.ResetInterlock->setTargets("k"+modNum+"/mod/modtiming_k"+modNum+".01->Reset;f/interlock/mod"+modNum+"->Acknowledge");
 				ui.rfReverseAB_2->setSource("f/interlock/mod04/StatThyTriggerEnable");
 			}
 			else if (!modNum.compare("sp")) {
-				ui.ResetInterlock->setTargets("kg"+modNum+"/mod/llrf_kg"+modNum+".01->ResetInterlock;kg"+modNum+"/mod/modtiming->Reset;f/interlock/mod00->Acknowledge");
+				ui.ResetInterlock->setTargets("k"+modNum+"/mod/llrf_k"+modNum+".01->ResetInterlock;k"+modNum+"/mod/modtiming_k"+modNum+".01->Reset;f/interlock/mod00->Acknowledge");
 				ui.rfReverseAB_2->setSource("f/interlock/mod00/StatRfTrigger");
 			}
 			else {
-				ui.ResetInterlock->setTargets("kg"+modNum+"/mod/llrf_kg"+modNum+".01->ResetInterlock;kg"+modNum+"/mod/modtiming->Reset;f/interlock/mod"+modNum+"->Acknowledge");
+				ui.ResetInterlock->setTargets("k"+modNum+"/mod/llrf_k"+modNum+".01->ResetInterlock;k"+modNum+"/mod/modtiming_k"+modNum+".01->Reset;f/interlock/mod"+modNum+"->Acknowledge");
 				ui.rfReverseAB_2->setSource("f/interlock/mod"+modNum+"/StatRfTrigger");
 			}
-			// ui.ThyratronOn->setTargets("kg"+modNum+"/mod/modtiming->ThyMeaOn;f/interlock/mod"+modNum+"->Acknowledge");
-			ui.ThyratronOn->setTargets("kg"+modNum+"/mod/modtiming->ThyMeaOn");
-			ui.ThyratronOff->setTargets("kg"+modNum+"/mod/modtiming->ThyMeaOff");
-			ui.Rfamp_Led_2->setSource("kg"+modNum+"/mod/rfamp/IsOn");
+			// ui.ThyratronOn->setTargets("k"+modNum+"/mod/modtiming_k"+modNum+".01->ThyMeaOn;f/interlock/mod"+modNum+"->Acknowledge");
+			ui.ThyratronOn->setTargets("k"+modNum+"/mod/modtiming_k"+modNum+".01->ThyMeaOn");
+			ui.ThyratronOff->setTargets("k"+modNum+"/mod/modtiming_k"+modNum+".01->ThyMeaOff");
+			ui.Rfamp_Led_2->setSource("k"+modNum+"/mod/rfamp_k"+modNum+".01/IsOn");
 			ui.rfReverseAB_2->setNumColumns(modNum.toInt()==4? 1: 2);
 			// ui.rfReverseAB_2->setDisplayMask(modNum.toInt()<3? "4,5": (modNum.toInt()==4? "12": "4,5"));
 			ui.rfReverseAB_2->setDisplayMask(modNum.toInt()<3? "3,4": (modNum.toInt()==4? "12": "2,3"));
 			// ui.rfReverseAB_2->setSource("f/interlock/mod"+modNum+(modNum.toInt()==4? "/StatThyTriggerEnable": "/StatRfTrigger"));
 			ui.rfReverseAB_2->setTrueColors(ui.rfReverseAB_2->trueColors());
-			ui.rfamp_reset_2->setTargets("kg"+modNum+"/mod/rfamp->ResetReversePower");
-			// ui.RfOn->setTargets("kg"+modNum+"/mod/llrf_kg"+modNum+".01/pulse_enable(true);f/interlock/mod"+modNum+"->Ackmod");
-			// ui.RfOff->setTargets("kg"+modNum+"/mod/llrf_kg"+modNum+".01/pulse_enable(false)");
-			// ui.RfOn->setTargets("kg"+modNum+"/mod/modtiming->RfOn;f/interlock/mod"+modNum+"->Ackmod");
-			ui.RfOff->setTargets("kg"+modNum+"/mod/modtiming->RfOff");
+			ui.rfamp_reset_2->setTargets("k"+modNum+"/mod/rfamp_k"+modNum+".01->ResetReversePower");
+			// ui.RfOn->setTargets("k"+modNum+"/mod/llrf_k"+modNum+".01/pulse_enable(true);f/interlock/mod"+modNum+"->Ackmod");
+			// ui.RfOff->setTargets("k"+modNum+"/mod/llrf_k"+modNum+".01/pulse_enable(false)");
+			// ui.RfOn->setTargets("k"+modNum+"/mod/modtiming_k"+modNum+".01->RfOn;f/interlock/mod"+modNum+"->Ackmod");
+			ui.RfOff->setTargets("k"+modNum+"/mod/modtiming_k"+modNum+".01->RfOff");
 
 			sleep(0.2);
 
 			// Filaments tab
 			if (!modNum.compare("sp")) {
-				ui.RfOn->setTargets("kg"+modNum+"/mod/modtiming->RfOn;f/interlock/mod00->Ackmod");
+				ui.RfOn->setTargets("k"+modNum+"/mod/modtiming_k"+modNum+".01->RfOn;f/interlock/mod00->Ackmod");
 				ui.thyfil_enable->setSource("f/interlock/mod00/StatHvEnable");
 				ui.thyfil_enable->setDisplayMask("7");
 				ui.thyfil_psk_stat->setSource("f/interlock/mod00/StatHvEnable");
@@ -1921,7 +1880,7 @@ super::super(QWidget *parent) : QWidget(parent)
 				ui.klyfil_psk_stat->setSource("f/interlock/mod00/StatHvEnable");
 			}
 			else if (!modNum.compare("ST")) {
-				ui.RfOn->setTargets("kg05/mod/modtiming_kg05.03->RfOn;kst/interlock/mod_kst->Ackmod");
+				ui.RfOn->setTargets("kst/modmodtiming_kst.01->RfOn;kst/interlock/mod_kst->Ackmod");
 				ui.thyfil_enable->setSource("kst/interlock/mod_kst/StatHvEnable");
 				ui.thyfil_enable->setDisplayMask("7");
 				ui.thyfil_psk_stat->setSource("kst/interlock/mod_kst/StatHvEnable");
@@ -1930,7 +1889,7 @@ super::super(QWidget *parent) : QWidget(parent)
 				ui.klyfil_psk_stat->setSource("kst/interlock/mod_kst/StatHvEnable");
 			}
 			else if (!modNum.compare("16")) {
-				ui.RfOn->setTargets("kg05/mod/modtiming_kg05.03->RfOn;kst/interlock/mod_kst->Ackmod");
+				ui.RfOn->setTargets("kst/modmodtiming_kst.01->RfOn;kst/interlock/mod_kst->Ackmod");
 				ui.thyfil_enable->setSource("kst/interlock/mod_kst/StatHvEnable");
 				ui.thyfil_enable->setDisplayMask("7");
 				// ui.thyfil_psk_stat->setSource("kst/interlock/mod_kst/StatHvEnable");
@@ -1939,7 +1898,7 @@ super::super(QWidget *parent) : QWidget(parent)
 				// ui.klyfil_psk_stat->setSource("kst/interlock/mod_kst/StatHvEnable");
 			}
 			else {
-				ui.RfOn->setTargets("kg"+modNum+"/mod/modtiming->RfOn;f/interlock/mod"+modNum+"->Ackmod");
+				ui.RfOn->setTargets("k"+modNum+"/mod/modtiming_k"+modNum+".01->RfOn;f/interlock/mod"+modNum+"->Ackmod");
 				ui.thyfil_enable->setSource("f/interlock/mod"+modNum+"/StatHvEnable");
 				ui.thyfil_enable->setDisplayMask("7");
 				ui.thyfil_psk_stat->setSource("f/interlock/mod"+modNum+"/StatHvEnable");
@@ -1948,34 +1907,34 @@ super::super(QWidget *parent) : QWidget(parent)
 				ui.klyfil_psk_stat->setSource("f/interlock/mod"+modNum+"/StatHvEnable");
 			}
 
-			ui.thyfil_vlt->setSource("kg"+modNum+"/mod/thyfil/Voltage");
-			ui.thyfil_cur->setSource("kg"+modNum+"/mod/thyfil/Current");
-			// ui.thyfil_vlt_fault->setSource("kg"+modNum+"/mod/thyfil/VoltageFault");
-			// ui.thyfil_cur_fault->setSource("kg"+modNum+"/mod/thyfil/CurrentFault");
-			ui.thyfil_off->setTargets("kg"+modNum+"/mod/thyfil->Off");
-			ui.thyfil_isOff->setSource("kg"+modNum+"/mod/thyfil/IsOff");
-			// ui.thyfil_on->setTargets("kg"+modNum+"/mod/thyfil->On;f/interlock/mod"+modNum+"->Acknowledge");
-			ui.thyfil_on->setTargets("kg"+modNum+"/mod/thyfil->On");
-			ui.thyfil_isOn->setSource("kg"+modNum+"/mod/thyfil/IsOn");
-			// ui.thyfil_termoswitch->setSource("kg"+modNum+"/mod/thyfil/IsTermoswitch");
-			// ui.thyfil_wait->setSource("kg"+modNum+"/mod/thyfil/IsWaiting");
-			// ui.thyfil_psk->setSource("kg"+modNum+"/mod/thyfil/IsPsk");
-			ui.thyfil_reset->setTargets("kg"+modNum+"/mod/thyfil->Reset");
-			// ui.thyfil_fault->setSource("kg"+modNum+"/mod/thyfil/IsFault");
-
-			ui.klyfil_vlt->setSource("kg"+modNum+"/mod/klyfil/Voltage");
-			ui.klyfil_cur->setSource("kg"+modNum+"/mod/klyfil/Current");
-			// ui.klyfil_vlt_fault->setSource("kg"+modNum+"/mod/klyfil/VoltageFault");
-			// ui.klyfil_cur_fault->setSource("kg"+modNum+"/mod/klyfil/CurrentFault");
-			ui.klyfil_off->setTargets("kg"+modNum+"/mod/klyfil->Off");
-			ui.klyfil_isOff->setSource("kg"+modNum+"/mod/klyfil/IsOff");
-			// ui.klyfil_80->setTargets("kg"+modNum+"/mod/klyfil->Standby;f/interlock/mod"+modNum+"->Acknowledge");
-			ui.klyfil_80->setTargets("kg"+modNum+"/mod/klyfil->Standby");
-			ui.klyfil_is80->setSource("kg"+modNum+"/mod/klyfil/Is80");
-			// ui.klyfil_100->setTargets("kg"+modNum+"/mod/klyfil->On;f/interlock/mod"+modNum+"->Acknowledge");
-			ui.klyfil_100->setTargets("kg"+modNum+"/mod/klyfil->On");
-			ui.klyfil_is100->setSource("kg"+modNum+"/mod/klyfil/Is100");
-			ui.klyfil_reset->setTargets("kg"+modNum+"/mod/klyfil->Reset");
+			ui.thyfil_vlt->setSource("k"+modNum+"/mod/thyfil_k"+modNum+".01/Voltage");
+			ui.thyfil_cur->setSource("k"+modNum+"/mod/thyfil_k"+modNum+".01/Current");
+			// ui.thyfil_vlt_fault->setSource("k"+modNum+"/mod/thyfil_k"+modNum+".01/VoltageFault");
+			// ui.thyfil_cur_fault->setSource("k"+modNum+"/mod/thyfil_k"+modNum+".01/CurrentFault");
+			ui.thyfil_off->setTargets("k"+modNum+"/mod/thyfil_k"+modNum+".01->Off");
+			ui.thyfil_isOff->setSource("k"+modNum+"/mod/thyfil_k"+modNum+".01/IsOff");
+			// ui.thyfil_on->setTargets("k"+modNum+"/mod/thyfil_k"+modNum+".01->On;f/interlock/mod"+modNum+"->Acknowledge");
+			ui.thyfil_on->setTargets("k"+modNum+"/mod/thyfil_k"+modNum+".01->On");
+			ui.thyfil_isOn->setSource("k"+modNum+"/mod/thyfil_k"+modNum+".01/IsOn");
+			// ui.thyfil_termoswitch->setSource("k"+modNum+"/mod/thyfil_k"+modNum+".01/IsTermoswitch");
+			// ui.thyfil_wait->setSource("k"+modNum+"/mod/thyfil_k"+modNum+".01/IsWaiting");
+			// ui.thyfil_psk->setSource("k"+modNum+"/mod/thyfil_k"+modNum+".01/IsPsk");
+			ui.thyfil_reset->setTargets("k"+modNum+"/mod/thyfil_k"+modNum+".01->Reset");
+			// ui.thyfil_fault->setSource("k"+modNum+"/mod/thyfil_k"+modNum+".01/IsFault");
+
+			ui.klyfil_vlt->setSource("k"+modNum+"/mod/klyfil_k"+modNum+".01/Voltage");
+			ui.klyfil_cur->setSource("k"+modNum+"/mod/klyfil_k"+modNum+".01/Current");
+			// ui.klyfil_vlt_fault->setSource("k"+modNum+"/mod/klyfil_k"+modNum+".01/VoltageFault");
+			// ui.klyfil_cur_fault->setSource("k"+modNum+"/mod/klyfil_k"+modNum+".01/CurrentFault");
+			ui.klyfil_off->setTargets("k"+modNum+"/mod/klyfil_k"+modNum+".01->Off");
+			ui.klyfil_isOff->setSource("k"+modNum+"/mod/klyfil_k"+modNum+".01/IsOff");
+			// ui.klyfil_80->setTargets("k"+modNum+"/mod/klyfil_k"+modNum+".01->Standby;f/interlock/mod"+modNum+"->Acknowledge");
+			ui.klyfil_80->setTargets("k"+modNum+"/mod/klyfil_k"+modNum+".01->Standby");
+			ui.klyfil_is80->setSource("k"+modNum+"/mod/klyfil_k"+modNum+".01/Is80");
+			// ui.klyfil_100->setTargets("k"+modNum+"/mod/klyfil_k"+modNum+".01->On;f/interlock/mod"+modNum+"->Acknowledge");
+			ui.klyfil_100->setTargets("k"+modNum+"/mod/klyfil_k"+modNum+".01->On");
+			ui.klyfil_is100->setSource("k"+modNum+"/mod/klyfil_k"+modNum+".01/Is100");
+			ui.klyfil_reset->setTargets("k"+modNum+"/mod/klyfil_k"+modNum+".01->Reset");
 			if (!modNum.compare("04")) {
 				ui.klyfil4_80->show();
 				ui.thyfil_psk_stat->setDisplayMask("1");
@@ -1995,29 +1954,23 @@ super::super(QWidget *parent) : QWidget(parent)
 			sleep(0.2);
 
 			// Misc tab
-			ui.repetition_rate->setSource("kg"+modNum+"/mod/modfreq/Frequency");
-			ui.premag_cur->setSource("kg"+modNum+"/mod/premag/Current");
-			ui.premag_off->setTargets("kg"+modNum+"/mod/premag->Off");
-			// ui.premag_on->setTargets("kg"+modNum+"/mod/premag->On;f/interlock/mod"+modNum+"->Acknowledge");
-			ui.premag_on->setTargets("kg"+modNum+"/mod/premag->On");
-			ui.premag_stat->setSource("kg"+modNum+"/mod/premag/State");
-			if (!modNum.compare("04") && !K4RfAmp.compare("kg04/mod/twtrfamp_kg04.01")) {
-				// ui.rfamp_off->setTargets("kg04/mod/twtrfamp_kg04.01->Off");
-				// ui.rfamp_on->setTargets("kg04/mod/twtrfamp_kg04.01->On");
-				// ui.rfamp_on->setTargets("kg04/mod/twtrfamp_kg04.01->On;f/interlock/mod"+modNum+"->Acknowledge");
-				ui.rfamp_stat->setSource("kg04/mod/twtrfamp_kg04.01/State");
+			ui.repetition_rate->setSource("k"+modNum+"/mod/modfreq_k"+modNum+".01/Frequency");
+			ui.premag_cur->setSource("k"+modNum+"/mod/premag_k"+modNum+".01/Current");
+			ui.premag_off->setTargets("k"+modNum+"/mod/premag_k"+modNum+".01->Off");
+			// ui.premag_on->setTargets("k"+modNum+"/mod/premag_k"+modNum+".01->On;f/interlock/mod"+modNum+"->Acknowledge");
+			ui.premag_on->setTargets("k"+modNum+"/mod/premag_k"+modNum+".01->On");
+			ui.premag_stat->setSource("k"+modNum+"/mod/premag_k"+modNum+".01/State");
+			if (!modNum.compare("04") && !K4RfAmp.compare("k04/mod/twtrfamp_k04.01")) {
+				ui.rfamp_stat->setSource("k04/mod/twtrfamp_k04.01/State");
 			}
 			else {
 				if (!modNum.compare("sp")){
-					//ui.rfamp_on->setTargets("kg"+modNum+"/mod/rfamp->On;f/interlock/mod00->Acknowledge");
-					// ui.rfamp_on->setTargets("kgsp/mod/rfamp->On;f/interlock/mod00->Acknowledge");
-					// ui.rfamp_off->setTargets("kgsp/mod/rfamp->Off");
-					ui.rfamp_stat->setSource("kgsp/mod/rfamp/IsOn");
+					ui.rfamp_stat->setSource("ks/mod/rfamp_ks.01/IsOn");
 				}
 				else {
-					// ui.rfamp_on->setTargets("kg"+modNum+"/mod/rfamp->On;f/interlock/mod"+modNum+"->Acknowledge");
-					// ui.rfamp_off->setTargets("kg"+modNum+"/mod/rfamp->Off");
-					ui.rfamp_stat->setSource("kg"+modNum+"/mod/rfamp/IsOn");
+					// ui.rfamp_on->setTargets("k"+modNum+"/mod/rfamp_k"+modNum+".01->On;f/interlock/mod"+modNum+"->Acknowledge");
+					// ui.rfamp_off->setTargets("k"+modNum+"/mod/rfamp_k"+modNum+".01->Off");
+					ui.rfamp_stat->setSource("k"+modNum+"/mod/rfamp_k"+modNum+".01/IsOn");
 				}
 			}
 			// ui.rfamp_stat->setDisplayMask(QList<unsigned>() << modNum.toUInt());
@@ -2032,7 +1985,7 @@ super::super(QWidget *parent) : QWidget(parent)
 			ui.rfReverseAB->setDisplayMask(modNum.toInt()<3? "3,4": (modNum.toInt()==4? "12": "2,3"));
 			if (!modNum.compare("04")) {
 				ui.rfReverseAB->setSource("f/interlock/mod04/StatThyTriggerEnable");
-				ui.reset_k4->setTargets("kg04/power_supply/psklyfoc_kg04.01->ResetInterlock");
+				ui.reset_k4->setTargets("k04/power_supply/psklyfoc_k04.01->ResetInterlock");
 			}
 			else if (!modNum.compare("sp")) {
 				ui.rfReverseAB->setSource("f/interlock/mod00/StatRfTrigger");
@@ -2044,28 +1997,28 @@ super::super(QWidget *parent) : QWidget(parent)
 			}
 			ui.rfReverseAB->setTrueColors(ui.rfReverseAB_2->trueColors());
 			if (!modNum.compare("04")) {
-				ui.foc_stat_1->setSource("kg"+modNum+"/power_supply/psklyfoc_kg"+modNum+".01/State");
-				ui.foc_stat_2->setSource("kg"+modNum+"/power_supply/psklyfoc_kg"+modNum+".04/State");
-				ui.foc_stat_3->setSource("kg"+modNum+"/power_supply/psklyfoc_kg"+modNum+".07/State");
-				ui.foc_off->setTargets("kg"+modNum+"/power_supply/psklyfoc_kg"+modNum+".01->Off;kg"+modNum+"/power_supply/psklyfoc_kg"+modNum+".04->Off;kg"+modNum+"/power_supply/psklyfoc_kg"+modNum+".07->Off");
-				ui.foc_on->setTargets("kg"+modNum+"/power_supply/psklyfoc_kg"+modNum+".01->On;kg"+modNum+"/power_supply/psklyfoc_kg"+modNum+".04->On;kg"+modNum+"/power_supply/psklyfoc_kg"+modNum+".07->On");
+				ui.foc_stat_1->setSource("k"+modNum+"/power_supply/psklyfoc_k"+modNum+".01/State");
+				ui.foc_stat_2->setSource("k"+modNum+"/power_supply/psklyfoc_k"+modNum+".04/State");
+				ui.foc_stat_3->setSource("k"+modNum+"/power_supply/psklyfoc_k"+modNum+".07/State");
+				ui.foc_off->setTargets("k"+modNum+"/power_supply/psklyfoc_k"+modNum+".01->Off;k"+modNum+"/power_supply/psklyfoc_k"+modNum+".04->Off;k"+modNum+"/power_supply/psklyfoc_k"+modNum+".07->Off");
+				ui.foc_on->setTargets("k"+modNum+"/power_supply/psklyfoc_k"+modNum+".01->On;k"+modNum+"/power_supply/psklyfoc_k"+modNum+".04->On;k"+modNum+"/power_supply/psklyfoc_k"+modNum+".07->On");
 				ui.foc_stat_1_label->setText("top");
 				ui.foc_stat_2_label->setText("bottom");
 				ui.foc_stat_3_label->setText("bucking");
 			}
 			else {
-				ui.foc_stat_1->setSource("kg"+modNum+"/power_supply/psklyfoc_kg"+modNum+".01/State");
-				ui.foc_stat_2->setSource("kg"+modNum+"/power_supply/psklyfoc_kg"+modNum+".02/State");
-				ui.foc_stat_3->setSource("kg"+modNum+"/power_supply/psklyfoc_kg"+modNum+".03/State");
-				ui.foc_off->setTargets("kg"+modNum+"/power_supply/psklyfoc_kg"+modNum+".01->Off;kg"+modNum+"/power_supply/psklyfoc_kg"+modNum+".02->Off;kg"+modNum+"/power_supply/psklyfoc_kg"+modNum+".03->Off");
-				ui.foc_on->setTargets("kg"+modNum+"/power_supply/psklyfoc_kg"+modNum+".01->On;kg"+modNum+"/power_supply/psklyfoc_kg"+modNum+".02->On;kg"+modNum+"/power_supply/psklyfoc_kg"+modNum+".03->On");
+				ui.foc_stat_1->setSource("k"+modNum+"/power_supply/psklyfoc_k"+modNum+".01/State");
+				ui.foc_stat_2->setSource("k"+modNum+"/power_supply/psklyfoc_k"+modNum+".02/State");
+				ui.foc_stat_3->setSource("k"+modNum+"/power_supply/psklyfoc_k"+modNum+".03/State");
+				ui.foc_off->setTargets("k"+modNum+"/power_supply/psklyfoc_k"+modNum+".01->Off;k"+modNum+"/power_supply/psklyfoc_k"+modNum+".02->Off;k"+modNum+"/power_supply/psklyfoc_k"+modNum+".03->Off");
+				ui.foc_on->setTargets("k"+modNum+"/power_supply/psklyfoc_k"+modNum+".01->On;k"+modNum+"/power_supply/psklyfoc_k"+modNum+".02->On;k"+modNum+"/power_supply/psklyfoc_k"+modNum+".03->On");
 				ui.foc_stat_1_label->setText("1");
 				ui.foc_stat_2_label->setText("2");
 				ui.foc_stat_3_label->setText("3");
 			}
-			ui.rfamp_reset->setTargets("kg"+modNum+"/mod/rfamp->ResetReversePower");
+			ui.rfamp_reset->setTargets("k"+modNum+"/mod/rfamp_k"+modNum+".01->ResetReversePower");
 
-			ui.reset_pi->setTargets("kg"+modNum+"/mod/klyfil->ResetIonicPump");
+			ui.reset_pi->setTargets("k"+modNum+"/mod/klyfil_k"+modNum+".01->ResetIonicPump");
 			if (!modNum.compare("sp")) {
 				ui.kly_vac_fault->setSource("f/interlock/mod00/StatThyTriggerEnable");
 				ui.piri_a_fault->setSource("f/interlock/mod00/StatThyTriggerEnable");
@@ -2078,10 +2031,10 @@ super::super(QWidget *parent) : QWidget(parent)
 				ui.piri_b_fault->setSource("f/interlock/mod"+modNum+"/StatThyTriggerEnable");
 				ui.wg_com->hide();
 			}
-			ui.reset_piri->setTargets("kg"+modNum+"/mod/rfamp->ResetPiri");
-			ui.vacuumKly->setSource("kg"+modNum+"/mod/klyfil/KlystronPressure");
-			ui.vacuumKlyInt->setSource("kg"+modNum+"/mod/klyfil/KlystronPressureIntegrated");
-			ui.KlyCollTemp->setSource("kg"+modNum+"/mod/klyfil/KlystronCollectorTemperature");
+			ui.reset_piri->setTargets("k"+modNum+"/mod/rfamp_k"+modNum+".01->ResetPiri");
+			ui.vacuumKly->setSource("k"+modNum+"/mod/klyfil_k"+modNum+".01/KlystronPressure");
+			ui.vacuumKlyInt->setSource("k"+modNum+"/mod/klyfil_k"+modNum+".01/KlystronPressureIntegrated");
+			ui.KlyCollTemp->setSource("k"+modNum+"/mod/klyfil_k"+modNum+".01/KlystronCollectorTemperature");
 			// restore widgets customized by mod 4
 			ui.klyfil_enable->show();
 			ui.KlyIntlkInfoButton->show();
@@ -2109,26 +2062,25 @@ super::super(QWidget *parent) : QWidget(parent)
 				// ui.peakI->show();
 				// ui.revI->show();
 				ui.peakI_2->show();
-				ui.peakI_2->setSource("kg"+modNum+"/mod/scopemod_kg"+modNum+".01/C1TOP");
+				ui.peakI_2->setSource("k"+modNum+"/mod/scope_k"+modNum+".01/C1TOP");
 				ui.frame_sf6_ctf->hide();
 			}
-			ui.peakI->setSource("kg"+modNum+"/mod/scopemod_kg"+modNum+".01/C1TOP");
-			ui.revI->setSource("kg"+modNum+"/mod/scopemod_kg"+modNum+".01/C1PKPK");
+			ui.peakI->setSource("k"+modNum+"/mod/scope_k"+modNum+".01/C1TOP");
+			ui.revI->setSource("k"+modNum+"/mod/scope_k"+modNum+".01/C1PKPK");
 			ui.tertiaryLabel->hide();
 			ui.tertiaryInfoButton->hide();
 			// ui.fug_begin->setSource("f/misc/formulalinac_f/fug_begin_"+(modNum.compare("sp")? modNum: "00"));
-			ui.fug_begin->setSource("kg"+modNum+"/mod/modtiming/FugBegin");
-			ui.fug_width->setSource("kg"+modNum+"/mod/modtiming/FugWidth");
-			ui.fug_polarity->setSource("kg"+modNum+"/mod/modtiming/FugPolarity");
-			ui.RnmMode->setSource("kg"+modNum+"/mod/llrf_kg"+modNum+".01/RnmMode");
-			ui.RnmMode->setTargets("kg"+modNum+"/mod/llrf_kg"+modNum+".01/RnmMode");
+			ui.fug_begin->setSource("k"+modNum+"/mod/modtiming_k"+modNum+".01/FugBegin");
+			ui.fug_width->setSource("k"+modNum+"/mod/modtiming_k"+modNum+".01/FugWidth");
+			ui.fug_polarity->setSource("k"+modNum+"/mod/modtiming_k"+modNum+".01/FugPolarity");
+			ui.RnmMode->setSource("k"+modNum+"/mod/llrf_k"+modNum+".01/RnmMode");
+			ui.RnmMode->setTargets("k"+modNum+"/mod/llrf_k"+modNum+".01/RnmMode");
 			if (!modNum.compare("01") || !modNum.compare("02")) {
 				ui.frame_sf6->show();
 				ui.TimeToGo_Label_5->show();
 				ui.frame_sf6_common->show();
 				// ui.reset_scope->show();
 				// ui.open_scope->hide();
-				// ui.reset_scope->setTargets("kg"+modNum+"/mod/scope->Reset");
 				ui.wg_com->show();
 			}
 			else if (!modNum.compare("04")) {
@@ -2140,24 +2092,24 @@ super::super(QWidget *parent) : QWidget(parent)
 				// ui.rfamp_off->setConfirmNeeded(true);
 				ui.klyfil_enable->hide();
 				ui.KlyIntlkInfoButton->hide();
-				ui.klyfil_vlt->setSource("kg04/power_supply/psklyfil_kg04.01/Voltage");
-				ui.klyfil_cur->setSource("kg04/power_supply/psklyfil_kg04.01/Current");
-				//ui.klyfil_psk_stat->setSource("kg04/power_supply/psklyfil_kg04.01/State");
+				ui.klyfil_vlt->setSource("k04/power_supply/psklyfil_k04.01/Voltage");
+				ui.klyfil_cur->setSource("k04/power_supply/psklyfil_k04.01/Current");
+				//ui.klyfil_psk_stat->setSource("k04/power_supply/psklyfil_k04.01/State");
 				ui.klyfil_state_k4->show();
 				ui.klyfil_psk_stat->hide();
 				ui.klyfilInfoButton->hide();
-				ui.klyfil_off->setTargets("kg04/power_supply/psklyfil_kg04.01->Off");
-				// ui.klyfil_80->setTargets("kg04/power_supply/psklyfil_kg04.01->Reset;kg04/power_supply/psklyfil_kg04.01->On");
-				ui.klyfil_80->setTargets("kg04/power_supply/psklyfil_kg04.01->On");
-				// ui.klyfil_80->setTargets("kg04/power_supply/psklyfil_kg04.01->Standby");
+				ui.klyfil_off->setTargets("k04/power_supply/psklyfil_k04.01->Off");
+				// ui.klyfil_80->setTargets("k04/power_supply/psklyfil_k04.01->Reset;k04/power_supply/psklyfil_k04.01->On");
+				ui.klyfil_80->setTargets("k04/power_supply/psklyfil_k04.01->On");
+				// ui.klyfil_80->setTargets("k04/power_supply/psklyfil_k04.01->Standby");
 				ui.klyfil_80->setText("ON");
-				ui.klyfil_100->setTargets("kg04/power_supply/psklyfil_kg04.01->Abort");
-				// ui.klyfil_100->setTargets("kg04/power_supply/psklyfil_kg04.01->Standby");
+				ui.klyfil_100->setTargets("k04/power_supply/psklyfil_k04.01->Abort");
+				// ui.klyfil_100->setTargets("k04/power_supply/psklyfil_k04.01->Standby");
 				ui.klyfil_100->setText("Stop");
 				ui.klyfil_isOff->hide();
 				ui.klyfil_is80->hide();
 				ui.klyfil_is100->hide();
-				ui.klyfil_reset->setTargets("kg04/power_supply/psklyfil_kg04.01->Reset");
+				ui.klyfil_reset->setTargets("k04/power_supply/psklyfil_k04.01->Reset");
 				// ui.reset_k4->show();
 			}
 			else if (!modNum.compare("06") || !modNum.compare("07") ||
@@ -2188,26 +2140,25 @@ super::super(QWidget *parent) : QWidget(parent)
 				ui.tertiaryInfoButton->show();
 			}
 			//if (!modNum.compare("04")) {
-			if (!modNum.compare("04") && !K4RfAmp.compare("kg04/mod/twtrfamp_kg04.01")) {
-				cmd_rfamp_off->setTargets("kg04/mod/twtrfamp_kg04.01->Off");
+			if (!modNum.compare("04") && !K4RfAmp.compare("k04/mod/twtrfamp_k04.01")) {
+				cmd_rfamp_off->setTargets("k04/mod/twtrfamp_k04.01->Off");
 			}
 			else if (!modNum.compare("05")) {
-				cmd_rfamp_off->setTargets("kg"+modNum+"/mod/rfamp_kg"+modNum+".01->Off");
+				cmd_rfamp_off->setTargets("k"+modNum+"/mod/rfamp_k"+modNum+".01->Off");
 			}
 			else {
-				cmd_rfamp_off->setTargets("kg"+modNum+"/mod/rfamp->Off");
+				cmd_rfamp_off->setTargets("k"+modNum+"/mod/rfamp_k"+modNum+".01->Off");
 			}
 			// if (!modNum.compare("04")) {
-			if (!modNum.compare("04") && !K4RfAmp.compare("kg04/mod/twtrfamp_kg04.01")) {
-				// cout << "cmd_rfamp_on->setTargets(kg04/mod/twtrfamp_kg04.01->On;f/interlock/mod04->Acknowledge)" << endl;
-				cmd_rfamp_on->setTargets("kg04/mod/twtrfamp_kg04.01->On;f/interlock/mod04->Acknowledge");
+			if (!modNum.compare("04") && !K4RfAmp.compare("k04/mod/twtrfamp_k04.01")) {
+				// cout << "cmd_rfamp_on->setTargets(k04/mod/twtrfamp_k04.01->On;f/interlock/mod04->Acknowledge)" << endl;
+				cmd_rfamp_on->setTargets("k04/mod/twtrfamp_k04.01->On;f/interlock/mod04->Acknowledge");
 			}
 			else if (!modNum.compare("05")) {
-				cmd_rfamp_on->setTargets("kg"+modNum+"/mod/rfamp_kg"+modNum+".01->On");
+				cmd_rfamp_on->setTargets("k"+modNum+"/mod/rfamp_k"+modNum+".01->On");
 			}
 			else {
-				// cout << "cmd_rfamp_on->setTargets(kgXY/mod/rfamp->On)" << endl;
-				cmd_rfamp_on->setTargets("kg"+modNum+"/mod/rfamp->On");
+				cmd_rfamp_on->setTargets("k"+modNum+"/mod/rfamp_k"+modNum+".01->On");
 			}
 			ui.Ross_ON->setEnabled(true);
 			ui.HV_ON->setEnabled(true);
@@ -2217,13 +2168,13 @@ super::super(QWidget *parent) : QWidget(parent)
 			ui.Stop_PushButton_2->setEnabled(true);
 			ui.setCur_ApplyNumeric->setEnabled(true);
 			if (llrfServer) {delete llrfServer; llrfServer = 0;}
-			connectDevice("kg"+modNum+"/mod/llrf_kg"+modNum+".01", &llrfServer);
+			connectDevice("k"+modNum+"/mod/llrf_k"+modNum+".01", &llrfServer);
 			if (timingServer) {delete timingServer; timingServer = 0;}
-			connectDevice("kg"+modNum+"/mod/modtiming", &timingServer);
+			connectDevice("k"+modNum+"/mod/modtiming_k"+modNum+".01", &timingServer);
 			if (hvServer) {delete hvServer; hvServer = 0;}
-			connectDevice("kg"+modNum+"/mod/hv", &hvServer);
+			connectDevice("k"+modNum+"/mod/hv_k"+modNum+".01", &hvServer);
 			if (condServer) {delete condServer; condServer = 0;}
-			connectDevice("kg"+modNum+"/mod/modcond-kg"+modNum+"-01", &condServer);
+			connectDevice("k"+modNum+"/mod/modcond_k"+modNum+".01", &condServer);
 		}
 		ui.dequing_label->hide();
 		ui.dequing_state->hide();
@@ -2304,7 +2255,7 @@ super::super(QWidget *parent) : QWidget(parent)
 			// ui.Ross_Interlock_Enable->show();
 			ui.thyfil_timer->hide();
 			ui.klyfil_timer->hide();
-			ui.klyfil_state_k4->setSource("kg04/power_supply/psklyfil_kg04.01/State");
+			ui.klyfil_state_k4->setSource("k04/power_supply/psklyfil_k04.01/State");
 			if (modNum.compare("04")) ui.klyfil_state_k4->hide();
 			ui.thyfil_state_k16->hide();
 			ui.reset_premag->hide();
diff --git a/src/super.ui b/src/super.ui
index 6a715832b758c7b3d97026a9efa0d8bcbd85b65c..f5bb9b1068127cb10f65c4c388ade6a79bde51b3 100755
--- a/src/super.ui
+++ b/src/super.ui
@@ -7145,7 +7145,7 @@ p, li { white-space: pre-wrap; }
        </font>
       </property>
       <property name="source">
-       <string>kg04/power_supply/psklyfil_kg04.01/State</string>
+       <string>k04/power_supply/psklyfil_k04.01/State</string>
       </property>
      </widget>
      <widget class="QPushButton" name="klyfil4_80">