From 9d739dbcb63df2bdad514699e0f9d399f9816109 Mon Sep 17 00:00:00 2001
From: Alexander van Amesfoort <amesfoort@astron.nl>
Date: Thu, 5 Feb 2015 15:26:22 +0000
Subject: [PATCH] Task #7430: replace in sources seg@astron.nl by
 softwaresupport@astron.nl

Jan David agreed it makes sense, although some software covered is not
currently maintained by the RO software team.
All replacements happen in comments, so this is safe. (viewed svn diff | grep ... by hand)
Command used:
LOFAR$ grep -r -l seg@astron.nl * | xargs sed -i -e 's/seg@astron.nl/softwaresupport@astron.nl/g'
---
 .../include/BBSKernel/Expr/BasicExpr.h        |   2 +-
 .../BBSKernel/include/BBSKernel/Expr/Cache.h  |   2 +-
 .../include/BBSKernel/Expr/ConditionNumber.h  |   2 +-
 .../include/BBSKernel/Expr/Element.h          |   2 +-
 .../include/BBSKernel/Expr/ExprAdaptors.h     |   2 +-
 .../BBSKernel/include/BBSKernel/Expr/ExprId.h |   2 +-
 .../include/BBSKernel/Expr/ExprValue.h        |   2 +-
 .../BBSKernel/Expr/ExprValueIterator.h        |   2 +-
 .../include/BBSKernel/Expr/ExprValueView.h    |   2 +-
 .../include/BBSKernel/Expr/ExprVisData.h      |   2 +-
 .../include/BBSKernel/Expr/FlagArray.h        |   2 +-
 .../BBSKernel/include/BBSKernel/Expr/FlagIf.h |   2 +-
 .../include/BBSKernel/Expr/Literal.h          |   2 +-
 .../include/BBSKernel/Expr/MatrixMul2.h       |   2 +-
 .../include/BBSKernel/Expr/MatrixMul3.h       |   2 +-
 .../include/BBSKernel/Expr/MatrixSum.h        |   2 +-
 .../include/BBSKernel/Expr/MergeFlags.h       |   2 +-
 .../include/BBSKernel/Expr/RefCounting.h      |   2 +-
 .../include/BBSKernel/Expr/Resampler.h        |   2 +-
 .../include/BBSKernel/Expr/ScalarMatrixMul.h  |   2 +-
 .../include/BBSKernel/Expr/StationUVW.h       |   2 +-
 .../BBSKernel/include/BBSKernel/ExprSet.h     |   2 +-
 CEP/Calibration/BBSKernel/src/Expr/Cache.cc   |   2 +-
 .../BBSKernel/src/Expr/ConditionNumber.cc     |   2 +-
 CEP/Calibration/BBSKernel/src/Expr/Element.cc |   2 +-
 .../BBSKernel/src/Expr/ExprAdaptors.cc        |   2 +-
 .../BBSKernel/src/Expr/ExprValue.cc           |   2 +-
 .../BBSKernel/src/Expr/ExprValueIterator.cc   |   2 +-
 .../BBSKernel/src/Expr/ExprValueView.cc       |   2 +-
 .../BBSKernel/src/Expr/ExprVisData.cc         |   2 +-
 .../BBSKernel/src/Expr/FlagArray.cc           |   2 +-
 CEP/Calibration/BBSKernel/src/Expr/Literal.cc |   2 +-
 .../BBSKernel/src/Expr/MatrixMul2.cc          |   2 +-
 .../BBSKernel/src/Expr/MatrixMul3.cc          |   2 +-
 .../BBSKernel/src/Expr/MatrixSum.cc           |   2 +-
 .../BBSKernel/src/Expr/Resampler.cc           |   2 +-
 .../BBSKernel/src/Expr/ScalarMatrixMul.cc     |   2 +-
 .../BBSKernel/src/Expr/StationUVW.cc          |   2 +-
 CEP/LMWCommon/include/LMWCommon/MWIos.h       |   2 +-
 CEP/ParmDB/src/startparmdbdistr               |   2 +-
 CMake/LofarCTest.cmake                        |   2 +-
 CMake/LofarConfig.cmake                       |   2 +-
 CMake/LofarFindPackage.cmake                  |   2 +-
 CMake/LofarGeneral.cmake                      |   2 +-
 CMake/LofarInit.cmake                         |   2 +-
 CMake/LofarMacros.cmake                       |   2 +-
 CMake/LofarOptions.cmake                      |   2 +-
 CMake/LofarPackage.cmake                      |   2 +-
 CMake/LofarPackageVersion.cmake               |   2 +-
 CMake/LofarSubversion.cmake                   |   2 +-
 CMake/LofarVariants.cmake                     |   2 +-
 CMake/MACAddProtocol.cmake                    |   2 +-
 CMake/PythonInstall.cmake                     |   2 +-
 CMake/UpdatePackageVersion.cmake.in           |   2 +-
 CMake/docscripts/MakeDoxyDoc.cmake.in         |   2 +-
 CMake/docscripts/slash2spanning.pl            |   2 +-
 CMake/gen_LofarPackageList_cmake.sh           |   2 +-
 CMake/testscripts/assay                       |   2 +-
 CMake/testscripts/runctest.sh.in              |   2 +-
 CMake/testscripts/runtest.sh                  |   2 +-
 .../src/plotter_config.properties             |   2 +-
 .../astron/lofar/java/gui/plotter/IPlot.java  |   2 +-
 .../java/gui/plotter/IPlotDataAccess.java     |   2 +-
 .../java/gui/plotter/IPlotDataExport.java     |   2 +-
 .../lofar/java/gui/plotter/PlotConstants.java |   2 +-
 .../java/gui/plotter/PlotController.java      |   2 +-
 .../java/gui/plotter/PlotDataManager.java     |   2 +-
 .../lofar/java/gui/plotter/PlotPanel.java     |   2 +-
 .../lofar/java/gui/plotter/PlotSGTImpl.java   |   2 +-
 .../exceptions/EmptyDataSetException.java     |   2 +-
 .../exceptions/InvalidDataSetException.java   |   2 +-
 .../exceptions/NotImplementedException.java   |   2 +-
 .../exceptions/NotSupportedException.java     |   2 +-
 ...PlotterConfigurationNotFoundException.java |   2 +-
 .../PlotterDataAccessException.java           |   2 +-
 ...erDataAccessorInitializationException.java |   2 +-
 ...terDataAccessorNotCompatibleException.java |   2 +-
 .../PlotterDataAccessorNotFoundException.java |   2 +-
 .../plotter/exceptions/PlotterException.java  |   2 +-
 ...otterFrameworkInitializationException.java |   2 +-
 ...lotterFrameworkNotCompatibleException.java |   2 +-
 .../PlotterFrameworkNotFoundException.java    |   2 +-
 .../exceptions/PlotterPrintException.java     |   2 +-
 .../plotter/test/PlotDataAccessTestImpl.java  |   2 +-
 .../plotter/test/PlotTestFrameStandAlone.java |   2 +-
 .../astron/lofar/lofarutils/LofarUtils.java   |   2 +-
 .../astron/lofar/lofarutils/remoteFile.java   |   2 +-
 .../lofar/lofarutils/remoteFileInterface.java |   2 +-
 LCS/ACC/PLC/src/ProcessControl.cc             |   2 +-
 LCS/ACC/PLC/test/APCmdImpl.cc                 |   2 +-
 LCS/ACC/PLC/test/APCmdImpl.h                  |   2 +-
 LCS/ACC/PLC/test/tACCmain.cc                  |   2 +-
 LCS/ApplCommon/include/ApplCommon/AntField.h  |   2 +-
 .../include/ApplCommon/AntennaSets.h          |   2 +-
 LCS/ApplCommon/include/ApplCommon/LofarDirs.h |   2 +-
 LCS/ApplCommon/src/AntField.cc                |   2 +-
 LCS/ApplCommon/src/AntennaSets.cc             |   2 +-
 LCS/ApplCommon/test/tAntField.cc              |   2 +-
 LCS/ApplCommon/test/tAntennaSet.cc            |   2 +-
 LCS/ApplCommon/test/tAntennaUse.cc            |   2 +-
 LCS/Blob/src/KeyParse.yy                      |   2 +-
 LCS/Blob/src/KeyTokenize.ll                   |   2 +-
 LCS/Common/include/Common/NsTimestamp.h       |   2 +-
 .../include/Common/Thread/Cancellation.h      |   2 +-
 LCS/Common/include/Common/Thread/Condition.h  |   2 +-
 LCS/Common/include/Common/Thread/Mutex.h      |   2 +-
 LCS/Common/include/Common/Thread/Queue.h      |   2 +-
 LCS/Common/include/Common/Thread/Thread.h     |   2 +-
 LCS/Common/include/Common/lofar_bitset.h      |   2 +-
 LCS/Common/src/NsTimestamp.cc                 |   2 +-
 LCS/Common/src/Thread/Cancellation.cc         |   2 +-
 LCS/Common/src/Thread/Thread.cc               |   2 +-
 LCS/Common/test/tKVpair.cc                    |   2 +-
 LCS/Common/test/tNsTimestamp.cc               |   2 +-
 .../templates/templated_header.tcc_template   |   2 +-
 .../APL/APLCommon/APLCommonExceptions.h       |   2 +-
 .../include/APL/APLCommon/APLUtilities.h      |   2 +-
 .../include/APL/APLCommon/APL_Defines.h       |   2 +-
 .../include/APL/APLCommon/AntennaField.h      |   2 +-
 .../include/APL/APLCommon/AntennaMapper.h     |   2 +-
 .../APLCommon/include/APL/APLCommon/CTState.h |   2 +-
 .../include/APL/APLCommon/ChildControl.h      |   2 +-
 .../include/APL/APLCommon/ControllerAdmin.h   |   2 +-
 .../include/APL/APLCommon/ControllerDefines.h |   2 +-
 .../include/APL/APLCommon/ControllerInfo.h    |   2 +-
 .../include/APL/APLCommon/ParentControl.h     |   2 +-
 .../include/APL/APLCommon/bitsetUtil.tcc      |   2 +-
 MAC/APL/APLCommon/src/APLUtilities.cc         |   2 +-
 MAC/APL/APLCommon/src/AntennaField.cc         |   2 +-
 MAC/APL/APLCommon/src/CTState.cc              |   2 +-
 MAC/APL/APLCommon/src/ChildControl.cc         |   2 +-
 MAC/APL/APLCommon/src/ControllerAdmin.cc      |   2 +-
 MAC/APL/APLCommon/src/ControllerDefines.cc    |   2 +-
 .../APLCommon/src/Controller_Protocol.prot    |   2 +-
 MAC/APL/APLCommon/src/ParentControl.cc        |   2 +-
 .../APLCommon/src/StartDaemon_Protocol.prot   |   2 +-
 MAC/APL/APLCommon/src/swlevel                 |   2 +-
 MAC/APL/APLCommon/test/ControllerProtMenu.cc  |   2 +-
 MAC/APL/APLCommon/test/ControllerProtMenu.h   |   2 +-
 MAC/APL/APLCommon/test/tAPLUtilities.cc       |   2 +-
 MAC/APL/APLCommon/test/tAntennaField.cc       |   2 +-
 MAC/APL/APLCommon/test/tAntennaMapper.cc      |   2 +-
 MAC/APL/APLCommon/test/tControllerDefines.cc  |   2 +-
 MAC/APL/APLCommon/test/tOutOfBand.cc          |   2 +-
 MAC/APL/APLCommon/test/tParentControl.cc      |   2 +-
 MAC/APL/APLCommon/test/tParentControl.h       |   2 +-
 MAC/APL/APLCommon/test/tbitsetUtil.cc         |   2 +-
 MAC/APL/Appl_Controller/src/ACCmdImpl.cc      |   2 +-
 MAC/APL/Appl_Controller/src/ACCmdImpl.h       |   2 +-
 MAC/APL/Appl_Controller/src/ACDaemon.cc       |   2 +-
 MAC/APL/Appl_Controller/src/ACDaemon.h        |   2 +-
 MAC/APL/Appl_Controller/src/ACDaemonComm.cc   |   2 +-
 MAC/APL/Appl_Controller/src/ACDaemonComm.h    |   2 +-
 MAC/APL/Appl_Controller/src/ACDaemonMain.cc   |   2 +-
 MAC/APL/Appl_Controller/src/ACRequestPool.cc  |   2 +-
 MAC/APL/Appl_Controller/src/ACRequestPool.h   |   2 +-
 MAC/APL/Appl_Controller/src/ACcli.cc          |   2 +-
 MAC/APL/Appl_Controller/src/ACuserMenu.cc     |   2 +-
 MAC/APL/Appl_Controller/src/APAdmin.cc        |   2 +-
 MAC/APL/Appl_Controller/src/APAdmin.h         |   2 +-
 MAC/APL/Appl_Controller/src/APAdminPool.cc    |   2 +-
 MAC/APL/Appl_Controller/src/APAdminPool.h     |   2 +-
 MAC/APL/Appl_Controller/src/ApplController.cc |   2 +-
 MAC/APL/Appl_Controller/src/ApplController.h  |   2 +-
 .../Appl_Controller/src/ApplControllerMain.cc |   2 +-
 MAC/APL/Appl_Controller/src/CmdStack.cc       |   2 +-
 MAC/APL/Appl_Controller/src/CmdStack.h        |   2 +-
 MAC/APL/Appl_Controller/src/ItemList.cc       |   2 +-
 MAC/APL/Appl_Controller/src/ItemList.h        |   2 +-
 MAC/APL/Appl_Controller/src/PR_BGL.cc         |   2 +-
 MAC/APL/Appl_Controller/src/PR_BGL.h          |   2 +-
 MAC/APL/Appl_Controller/src/PR_MPI.cc         |   2 +-
 MAC/APL/Appl_Controller/src/PR_MPI.h          |   2 +-
 MAC/APL/Appl_Controller/src/PR_Shell.cc       |   2 +-
 MAC/APL/Appl_Controller/src/PR_Shell.h        |   2 +-
 MAC/APL/Appl_Controller/src/ProcRule.cc       |   2 +-
 MAC/APL/Appl_Controller/src/ProcRule.h        |   2 +-
 MAC/APL/Appl_Controller/src/ProcRuler.cc      |   2 +-
 MAC/APL/Appl_Controller/src/ProcRuler.h       |   2 +-
 MAC/APL/Appl_Controller/src/StateEngine.cc    |   2 +-
 MAC/APL/Appl_Controller/src/StateEngine.h     |   2 +-
 MAC/APL/Appl_Controller/src/forkexec.cc       |   2 +-
 MAC/APL/Appl_Controller/src/forkexec.h        |   2 +-
 .../Appl_Controller/src/myACClientFunctions.h |   2 +-
 .../include/CASATools/CasaConverter.h         |   2 +-
 MAC/APL/CASATools/src/CasaConverter.cc        |   2 +-
 MAC/APL/CASATools/test/tCasaConverter.cc      |   2 +-
 .../src/CEPHardwareMonitor/BlueGeneMonitor.cc |   2 +-
 .../src/CEPHardwareMonitor/BlueGeneMonitor.h  |   2 +-
 .../CEPHardwareMonitorMain.cc                 |   2 +-
 .../src/CEPHardwareMonitor/ClusterMonitor.cc  |   2 +-
 .../src/CEPHardwareMonitor/ClusterMonitor.h   |   2 +-
 .../CEPCU/src/OnlineControl/OnlineControl.cc  |   2 +-
 .../CEPCU/src/OnlineControl/OnlineControl.h   |   2 +-
 .../src/OnlineControl/OnlineControlDefines.h  |   2 +-
 .../src/OnlineControl/OnlineControlMain.cc    |   2 +-
 MAC/APL/CEPCU/src/OnlineControl/Response.cc   |   2 +-
 MAC/APL/CEPCU/src/OnlineControl/Response.h    |   2 +-
 MAC/APL/CEPCU/src/OnlineControl/forkexec.cc   |   2 +-
 MAC/APL/CEPCU/src/OnlineControl/forkexec.h    |   2 +-
 .../CEPCU/src/OnlineControl/tPVSSMapping.cc   |   2 +-
 .../CEPCU/src/PythonControl/CMakeLists.txt    |   2 +-
 .../CEPCU/src/PythonControl/PythonControl.cc  |   2 +-
 .../CEPCU/src/PythonControl/PythonControl.h   |   2 +-
 .../src/PythonControl/PythonControlDefines.h  |   2 +-
 .../src/PythonControl/PythonControlMain.cc    |   2 +-
 .../CEPCU/src/PythonControl/uploadMetadata.cc |   2 +-
 .../_OfflineControl/CEPApplicationManager.cc  |   2 +-
 .../_OfflineControl/CEPApplicationManager.h   |   2 +-
 .../src/_OfflineControl/OfflineControl.cc     |   2 +-
 .../src/_OfflineControl/OfflineControl.h      |   2 +-
 .../_OfflineControl/OfflineControlDefines.h   |   2 +-
 .../src/_OfflineControl/OfflineControlMain.cc |   2 +-
 .../include/APL/CR_Protocol/CRreadRequest.h   |   2 +-
 .../include/APL/CR_Protocol/CRreadVector.h    |   2 +-
 .../include/APL/CR_Protocol/CRrecordRequest.h |   2 +-
 .../include/APL/CR_Protocol/CRrecordVector.h  |   2 +-
 .../include/APL/CR_Protocol/CRstopRequest.h   |   2 +-
 .../include/APL/CR_Protocol/CRstopVector.h    |   2 +-
 MAC/APL/CR_Protocol/src/CRreadRequest.cc      |   2 +-
 MAC/APL/CR_Protocol/src/CRreadVector.cc       |   2 +-
 MAC/APL/CR_Protocol/src/CRrecordRequest.cc    |   2 +-
 MAC/APL/CR_Protocol/src/CRrecordVector.cc     |   2 +-
 MAC/APL/CR_Protocol/src/CRstopRequest.cc      |   2 +-
 MAC/APL/CR_Protocol/src/CRstopVector.cc       |   2 +-
 MAC/APL/CR_Protocol/test/tCR_Protocol.cc      |   2 +-
 .../CUDaemons/CT_StartDaemon/CTStartDaemon.cc |   2 +-
 .../CUDaemons/CT_StartDaemon/CTStartDaemon.h  |   2 +-
 .../CT_StartDaemon/CTStartDaemonMain.cc       |   2 +-
 .../PVSSGateway_Stub/PVSSGatewayStub.cc       |   2 +-
 .../PVSSGateway_Stub/PVSSGatewayStub.h        |   2 +-
 .../PVSSGateway_Stub/PVSSGatewayStubMain.cc   |   2 +-
 .../CUDaemons/Service_Broker/ServiceBroker.cc |   2 +-
 .../CUDaemons/Service_Broker/ServiceBroker.h  |   2 +-
 .../Service_Broker/ServiceBrokerMain.cc       |   2 +-
 MAC/APL/CUDaemons/test/EventPort.cc           |   2 +-
 MAC/APL/CUDaemons/test/EventPort.h            |   2 +-
 MAC/APL/CUDaemons/test/LDtestMenu.cc          |   2 +-
 MAC/APL/CUDaemons/test/tLogClient.cc          |   2 +-
 .../src/KeyValueLogger/KeyValueLogger.cc      |   2 +-
 .../src/KeyValueLogger/KeyValueLogger.h       |   2 +-
 .../src/KeyValueLogger/KeyValueLoggerMain.cc  |   2 +-
 .../src/LogProcessor/LogProcessor.cc          |   2 +-
 .../src/LogProcessor/LogProcessor.h           |   2 +-
 .../src/LogProcessor/LogProcessorMain.cc      |   2 +-
 .../src/PVSSGateway/PVSSGateway.cc            |   2 +-
 .../src/PVSSGateway/PVSSGateway.h             |   2 +-
 .../src/PVSSGateway/PVSSGatewayMain.cc        |   2 +-
 .../src/SASGateway/SASGateway.cc              |   2 +-
 .../CURTDBDaemons/src/SASGateway/SASGateway.h |   2 +-
 .../src/SASGateway/SASGatewayMain.cc          |   2 +-
 .../src/SoftwareMonitor/SoftwareMonitor.cc    |   2 +-
 .../src/SoftwareMonitor/SoftwareMonitor.h     |   2 +-
 .../SoftwareMonitor/SoftwareMonitorMain.cc    |   2 +-
 MAC/APL/CURTDBDaemons/test/tKeyValueLogger.cc |   2 +-
 .../CURTDBDaemons/test/tLoggingProcessor.cc   |   2 +-
 MAC/APL/CURTDBDaemons/test/tPVSSGateway.cc    |   2 +-
 .../lofar/mac/apl/gui/jrsp/RCUMaskTest.java   |   2 +-
 .../mac/apl/gui/jrsp/WGRegisterTypeTest.java  |   2 +-
 .../jrsp/panels/MaskSelectionPanelTest.java   |   2 +-
 MAC/APL/Log_Client/src/LogClient.cc           |   2 +-
 MAC/APL/Log_Client/src/LogClient.h            |   2 +-
 MAC/APL/Log_Client/src/LogClientMain.cc       |   2 +-
 .../include/MD_Protocol/BeamletAllocation.h   |   2 +-
 .../include/MD_Protocol/BlAllocArr.h          |   2 +-
 MAC/APL/MD_Protocol/src/BeamletAllocation.cc  |   2 +-
 MAC/APL/MD_Protocol/src/BlAllocArr.cc         |   2 +-
 .../src/CRTriggerControl/TriggerControl.cc    |   2 +-
 .../src/CRTriggerControl/TriggerControl.h     |   2 +-
 .../CRTriggerControl/TriggerControlMain.cc    |   2 +-
 MAC/APL/MainCU/src/CRTriggerControl/crctl.cc  |   2 +-
 MAC/APL/MainCU/src/CRTriggerControl/crctl.h   |   2 +-
 .../MainCU/src/MACScheduler/MACScheduler.cc   |   2 +-
 .../MainCU/src/MACScheduler/MACScheduler.h    |   2 +-
 .../src/MACScheduler/MACSchedulerMain.cc      |   2 +-
 MAC/APL/MainCU/src/MACScheduler/ObsClaimer.cc |   2 +-
 MAC/APL/MainCU/src/MACScheduler/ObsClaimer.h  |   2 +-
 MAC/APL/MainCU/src/MACScheduler/claimTest.cc  |   2 +-
 MAC/APL/MainCU/src/MACScheduler/claimTest.h   |   2 +-
 .../ObservationControl/ObservationControl.cc  |   2 +-
 .../ObservationControl/ObservationControl.h   |   2 +-
 .../ObservationControlMain.cc                 |   2 +-
 .../include/APL/CAL_Protocol/ACC.h            |   2 +-
 .../include/APL/CAL_Protocol/AntennaArray.h   |   2 +-
 .../APL/CAL_Protocol/AntennaArrayData.h       |   2 +-
 .../include/APL/CAL_Protocol/AntennaGains.h   |   2 +-
 .../APL/CAL_Protocol/CalibrationInterface.h   |   2 +-
 .../include/APL/CAL_Protocol/SharedResource.h |   2 +-
 .../include/APL/CAL_Protocol/SpectralWindow.h |   2 +-
 .../include/APL/CAL_Protocol/SubArray.h       |   2 +-
 MAC/APL/PAC/CAL_Protocol/src/ACC.cc           |   2 +-
 MAC/APL/PAC/CAL_Protocol/src/AntennaArray.cc  |   2 +-
 .../PAC/CAL_Protocol/src/AntennaArrayData.cc  |   2 +-
 MAC/APL/PAC/CAL_Protocol/src/AntennaGains.cc  |   2 +-
 .../PAC/CAL_Protocol/src/SpectralWindow.cc    |   2 +-
 MAC/APL/PAC/CAL_Protocol/src/SubArray.cc      |   2 +-
 MAC/APL/PAC/Cal_Server/src/ACMProxy.cc        |   2 +-
 MAC/APL/PAC/Cal_Server/src/ACMProxy.h         |   2 +-
 MAC/APL/PAC/Cal_Server/src/BlitzMath.h        |   2 +-
 MAC/APL/PAC/Cal_Server/src/BlitzMath.tcc      |   2 +-
 MAC/APL/PAC/Cal_Server/src/CalServer.cc       |   2 +-
 MAC/APL/PAC/Cal_Server/src/CalServer.h        |   2 +-
 .../Cal_Server/src/CalibrationAlgorithm.cc    |   2 +-
 .../PAC/Cal_Server/src/CalibrationAlgorithm.h |   2 +-
 .../PAC/Cal_Server/src/CalibrationThread.cc   |   2 +-
 .../PAC/Cal_Server/src/CalibrationThread.h    |   2 +-
 MAC/APL/PAC/Cal_Server/src/DipoleModel.cc     |   2 +-
 MAC/APL/PAC/Cal_Server/src/DipoleModel.h      |   2 +-
 MAC/APL/PAC/Cal_Server/src/DipoleModelData.cc |   2 +-
 MAC/APL/PAC/Cal_Server/src/DipoleModelData.h  |   2 +-
 .../src/RemoteStationCalibration.cc           |   2 +-
 .../Cal_Server/src/RemoteStationCalibration.h |   2 +-
 MAC/APL/PAC/Cal_Server/src/Source.cc          |   2 +-
 MAC/APL/PAC/Cal_Server/src/Source.h           |   2 +-
 MAC/APL/PAC/Cal_Server/src/SourceData.cc      |   2 +-
 MAC/APL/PAC/Cal_Server/src/SourceData.h       |   2 +-
 .../Cal_Server/src/SubArraySubscription.cc    |   2 +-
 .../PAC/Cal_Server/src/SubArraySubscription.h |   2 +-
 MAC/APL/PAC/Cal_Server/src/SubArrays.cc       |   2 +-
 MAC/APL/PAC/Cal_Server/src/SubArrays.h        |   2 +-
 MAC/APL/PAC/Cal_Server/src/calinfo.cc         |   2 +-
 MAC/APL/PAC/Cal_Server/src/calinfo.h          |   2 +-
 MAC/APL/PAC/Cal_Server/test/CalTest.cc        |   2 +-
 MAC/APL/PAC/Cal_Server/test/CalTest.h         |   2 +-
 MAC/APL/PAC/IBS_Protocol/CMakeLists.txt       |   2 +-
 .../APL/IBS_Protocol/Beamlet2SubbandMap.h     |   2 +-
 .../include/APL/IBS_Protocol/CMakeLists.txt   |   2 +-
 .../include/APL/IBS_Protocol/Pointing.h       |   2 +-
 .../IBS_Protocol/src/Beamlet2SubbandMap.cc    |   2 +-
 MAC/APL/PAC/IBS_Protocol/src/CMakeLists.txt   |   2 +-
 MAC/APL/PAC/IBS_Protocol/src/Pointing.cc      |   2 +-
 .../include/APL/ICAL_Protocol/AntennaGains.h  |   2 +-
 .../APL/ICAL_Protocol/SpectralWindow.h        |   2 +-
 .../include/APL/ICAL_Protocol/SubArray.h      |   2 +-
 MAC/APL/PAC/ICAL_Protocol/src/AntennaGains.cc |   2 +-
 .../PAC/ICAL_Protocol/src/SpectralWindow.cc   |   2 +-
 MAC/APL/PAC/ICAL_Protocol/src/SubArray.cc     |   2 +-
 MAC/APL/PAC/ITRFBeamServer/src/AnaBeamMgr.cc  |   2 +-
 MAC/APL/PAC/ITRFBeamServer/src/AnaBeamMgr.h   |   2 +-
 .../PAC/ITRFBeamServer/src/AnalogueBeam.cc    |   2 +-
 MAC/APL/PAC/ITRFBeamServer/src/AnalogueBeam.h |   2 +-
 MAC/APL/PAC/ITRFBeamServer/src/Beam.cc        |   2 +-
 MAC/APL/PAC/ITRFBeamServer/src/Beam.h         |   2 +-
 MAC/APL/PAC/ITRFBeamServer/src/BeamServer.cc  |   2 +-
 MAC/APL/PAC/ITRFBeamServer/src/BeamServer.h   |   2 +-
 .../ITRFBeamServer/src/BeamServerConstants.h  |   2 +-
 .../PAC/ITRFBeamServer/src/BeamServerMain.cc  |   2 +-
 MAC/APL/PAC/ITRFBeamServer/src/DigitalBeam.cc |   2 +-
 MAC/APL/PAC/ITRFBeamServer/src/DigitalBeam.h  |   2 +-
 MAC/APL/PAC/ITRFBeamServer/src/StatCal.cc     |   2 +-
 MAC/APL/PAC/ITRFBeamServer/src/StatCal.h      |   2 +-
 MAC/APL/PAC/ITRFBeamServer/src/beamctl.cc     |   2 +-
 MAC/APL/PAC/ITRFBeamServer/src/beamctl.h      |   2 +-
 .../PAC/ITRFBeamServer/test/tAnaBeamMgr.cc    |   2 +-
 MAC/APL/PAC/ITRFBeamServer/test/tConverter.cc |   2 +-
 .../PAC/ITRFBeamServer/test/tHBATracking.cc   |   2 +-
 .../ITRFBeamServer/test/tIdealStartTime.cc    |   2 +-
 .../ITRFBeamServer/test/tJ2000Converter.cc    |   2 +-
 .../PAC/ITRFBeamServer/test/tLBATracking.cc   |   2 +-
 MAC/APL/PAC/ITRFBeamServer/test/tStatCal.cc   |   2 +-
 MAC/APL/PAC/ITRFCalServer/src/ACC.cc          |   2 +-
 MAC/APL/PAC/ITRFCalServer/src/ACC.h           |   2 +-
 MAC/APL/PAC/ITRFCalServer/src/ACCcache.cc     |   2 +-
 MAC/APL/PAC/ITRFCalServer/src/ACCcache.h      |   2 +-
 MAC/APL/PAC/ITRFCalServer/src/ACMProxy.cc     |   2 +-
 MAC/APL/PAC/ITRFCalServer/src/ACMProxy.h      |   2 +-
 MAC/APL/PAC/ITRFCalServer/src/CalServer.cc    |   2 +-
 MAC/APL/PAC/ITRFCalServer/src/CalServer.h     |   2 +-
 .../PAC/ITRFCalServer/src/CalServerMain.cc    |   2 +-
 .../ITRFCalServer/src/CalibrationThread.cc    |   2 +-
 .../PAC/ITRFCalServer/src/CalibrationThread.h |   2 +-
 .../PAC/ITRFCalServer/src/LBACalibration.cc   |   2 +-
 .../PAC/ITRFCalServer/src/LBACalibration.h    |   2 +-
 MAC/APL/PAC/ITRFCalServer/src/RequestPool.cc  |   2 +-
 MAC/APL/PAC/ITRFCalServer/src/RequestPool.h   |   2 +-
 .../PAC/ITRFCalServer/src/SharedResource.h    |   2 +-
 MAC/APL/PAC/ITRFCalServer/src/SubArrayMgr.cc  |   2 +-
 MAC/APL/PAC/ITRFCalServer/src/SubArrayMgr.h   |   2 +-
 MAC/APL/PAC/ITRFCalServer/src/calinfo.cc      |   2 +-
 MAC/APL/PAC/ITRFCalServer/src/calinfo.h       |   2 +-
 MAC/APL/PAC/ITRFCalServer/test/CalTest.cc     |   2 +-
 MAC/APL/PAC/ITRFCalServer/test/CalTest.h      |   2 +-
 MAC/APL/PAC/ITRFCalServer/test/tCalServer.cc  |   2 +-
 MAC/APL/PAC/ITRFCalServer/test/tCalServer.h   |   2 +-
 .../PAC/ITRFCalServer/test/tSubArrayMgr.cc    |   2 +-
 .../PAC/SHMInfo_Server/src/PropertyProxy.cc   |   2 +-
 .../PAC/SHMInfo_Server/src/PropertyProxy.h    |   2 +-
 MAC/APL/PAC/SHMInfo_Server/src/RspStatus.cc   |   2 +-
 MAC/APL/PAC/SHMInfo_Server/src/RspStatus.h    |   2 +-
 MAC/APL/PAC/SHMInfo_Server/src/SHMDefines.h   |   2 +-
 .../PAC/SHMInfo_Server/src/SHMInfoServer.cc   |   2 +-
 .../PAC/SHMInfo_Server/src/SHMInfoServer.h    |   2 +-
 .../SHMInfo_Server/src/SHMInfoServerMain.cc   |   2 +-
 .../SHMInfo_Server/src/SHMPolicyHandler.cc    |   2 +-
 .../PAC/SHMInfo_Server/src/SHMPolicyHandler.h |   2 +-
 MAC/APL/PAC/SHMInfo_Server/src/SHMSession.cc  |   2 +-
 MAC/APL/PAC/SHMInfo_Server/src/SHMSession.h   |   2 +-
 .../PAC/SHMInfo_Server/src/SHMSubscription.cc |   2 +-
 .../PAC/SHMInfo_Server/src/SHMSubscription.h  |   2 +-
 .../PAC/SHMInfo_Server/src/XCStatistics.cc    |   2 +-
 MAC/APL/PAC/SHMInfo_Server/src/XCStatistics.h |   2 +-
 .../PAC/SHMInfo_Server/test/MACall.tse.prot   |   2 +-
 MAC/APL/PAC/SHMInfo_Server/test/mis.btsw      |   2 +-
 MAC/APL/PIC/ETHTest/src/DataEvent.h           |   2 +-
 MAC/APL/PIC/ETHTest/src/ETH_realtime.cc       |   2 +-
 MAC/APL/PIC/ETHTest/src/ETH_test.cc           |   2 +-
 MAC/APL/PIC/ETHTest/src/MEPData.cc            |   2 +-
 MAC/APL/PIC/ETHTest/src/MEPData.h             |   2 +-
 MAC/APL/PIC/ETHTest/src/TCP_test.cc           |   2 +-
 MAC/APL/PIC/ETHTest/src/UDP_test.cc           |   2 +-
 MAC/APL/PIC/RSP_Driver/src/BMRead.cc          |   2 +-
 MAC/APL/PIC/RSP_Driver/src/BMRead.h           |   2 +-
 MAC/APL/PIC/RSP_Driver/src/BMWrite.cc         |   2 +-
 MAC/APL/PIC/RSP_Driver/src/BMWrite.h          |   2 +-
 MAC/APL/PIC/RSP_Driver/src/BSWrite.cc         |   2 +-
 MAC/APL/PIC/RSP_Driver/src/BSWrite.h          |   2 +-
 MAC/APL/PIC/RSP_Driver/src/BWRead.cc          |   2 +-
 MAC/APL/PIC/RSP_Driver/src/BWRead.h           |   2 +-
 MAC/APL/PIC/RSP_Driver/src/BWWrite.cc         |   2 +-
 MAC/APL/PIC/RSP_Driver/src/BWWrite.h          |   2 +-
 MAC/APL/PIC/RSP_Driver/src/BstRead.cc         |   2 +-
 MAC/APL/PIC/RSP_Driver/src/BstRead.h          |   2 +-
 MAC/APL/PIC/RSP_Driver/src/BypassRead.cc      |   2 +-
 MAC/APL/PIC/RSP_Driver/src/BypassRead.h       |   2 +-
 MAC/APL/PIC/RSP_Driver/src/BypassWrite.cc     |   2 +-
 MAC/APL/PIC/RSP_Driver/src/BypassWrite.h      |   2 +-
 MAC/APL/PIC/RSP_Driver/src/CDOWrite.cc        |   2 +-
 MAC/APL/PIC/RSP_Driver/src/CDOWrite.h         |   2 +-
 MAC/APL/PIC/RSP_Driver/src/CRSyncWrite.cc     |   2 +-
 MAC/APL/PIC/RSP_Driver/src/CRSyncWrite.h      |   2 +-
 .../PIC/RSP_Driver/src/CableAttenuation.cc    |   2 +-
 MAC/APL/PIC/RSP_Driver/src/CableAttenuation.h |   2 +-
 MAC/APL/PIC/RSP_Driver/src/CableSettings.cc   |   2 +-
 MAC/APL/PIC/RSP_Driver/src/CableSettings.h    |   2 +-
 MAC/APL/PIC/RSP_Driver/src/Cache.cc           |   2 +-
 MAC/APL/PIC/RSP_Driver/src/Cache.h            |   2 +-
 MAC/APL/PIC/RSP_Driver/src/Command.h          |   2 +-
 MAC/APL/PIC/RSP_Driver/src/GetBitModeCmd.cc   |   2 +-
 MAC/APL/PIC/RSP_Driver/src/GetBitModeCmd.h    |   2 +-
 MAC/APL/PIC/RSP_Driver/src/GetBypassCmd.cc    |   2 +-
 MAC/APL/PIC/RSP_Driver/src/GetBypassCmd.h     |   2 +-
 MAC/APL/PIC/RSP_Driver/src/GetClocksCmd.cc    |   2 +-
 MAC/APL/PIC/RSP_Driver/src/GetClocksCmd.h     |   2 +-
 .../PIC/RSP_Driver/src/GetDatastreamCmd.cc    |   2 +-
 MAC/APL/PIC/RSP_Driver/src/GetDatastreamCmd.h |   2 +-
 MAC/APL/PIC/RSP_Driver/src/GetHBACmd.cc       |   2 +-
 MAC/APL/PIC/RSP_Driver/src/GetHBACmd.h        |   2 +-
 MAC/APL/PIC/RSP_Driver/src/GetLatencyCmd.cc   |   2 +-
 MAC/APL/PIC/RSP_Driver/src/GetLatencyCmd.h    |   2 +-
 MAC/APL/PIC/RSP_Driver/src/GetRCUCmd.cc       |   2 +-
 MAC/APL/PIC/RSP_Driver/src/GetRCUCmd.h        |   2 +-
 MAC/APL/PIC/RSP_Driver/src/GetRawBlockCmd.cc  |   2 +-
 MAC/APL/PIC/RSP_Driver/src/GetRawBlockCmd.h   |   2 +-
 .../PIC/RSP_Driver/src/GetRegisterStateCmd.cc |   2 +-
 .../PIC/RSP_Driver/src/GetRegisterStateCmd.h  |   2 +-
 MAC/APL/PIC/RSP_Driver/src/GetSDOCmd.cc       |   2 +-
 MAC/APL/PIC/RSP_Driver/src/GetSDOCmd.h        |   2 +-
 MAC/APL/PIC/RSP_Driver/src/GetSDOModeCmd.cc   |   2 +-
 MAC/APL/PIC/RSP_Driver/src/GetSDOModeCmd.h    |   2 +-
 MAC/APL/PIC/RSP_Driver/src/GetSPUStatusCmd.cc |   2 +-
 MAC/APL/PIC/RSP_Driver/src/GetSPUStatusCmd.h  |   2 +-
 MAC/APL/PIC/RSP_Driver/src/GetSplitterCmd.cc  |   2 +-
 MAC/APL/PIC/RSP_Driver/src/GetSplitterCmd.h   |   2 +-
 MAC/APL/PIC/RSP_Driver/src/GetStatsCmd.cc     |   2 +-
 MAC/APL/PIC/RSP_Driver/src/GetStatsCmd.h      |   2 +-
 MAC/APL/PIC/RSP_Driver/src/GetStatusCmd.cc    |   2 +-
 MAC/APL/PIC/RSP_Driver/src/GetStatusCmd.h     |   2 +-
 MAC/APL/PIC/RSP_Driver/src/GetSubbandsCmd.cc  |   2 +-
 MAC/APL/PIC/RSP_Driver/src/GetSubbandsCmd.h   |   2 +-
 MAC/APL/PIC/RSP_Driver/src/GetSwapxyCmd.cc    |   2 +-
 MAC/APL/PIC/RSP_Driver/src/GetSwapxyCmd.h     |   2 +-
 MAC/APL/PIC/RSP_Driver/src/GetTBBCmd.cc       |   2 +-
 MAC/APL/PIC/RSP_Driver/src/GetTBBCmd.h        |   2 +-
 MAC/APL/PIC/RSP_Driver/src/GetTDStatusCmd.cc  |   2 +-
 MAC/APL/PIC/RSP_Driver/src/GetTDStatusCmd.h   |   2 +-
 MAC/APL/PIC/RSP_Driver/src/GetVersionsCmd.cc  |   2 +-
 MAC/APL/PIC/RSP_Driver/src/GetVersionsCmd.h   |   2 +-
 MAC/APL/PIC/RSP_Driver/src/GetWGCmd.cc        |   2 +-
 MAC/APL/PIC/RSP_Driver/src/GetWGCmd.h         |   2 +-
 MAC/APL/PIC/RSP_Driver/src/GetWeightsCmd.cc   |   2 +-
 MAC/APL/PIC/RSP_Driver/src/GetWeightsCmd.h    |   2 +-
 MAC/APL/PIC/RSP_Driver/src/GetXCStatsCmd.cc   |   2 +-
 MAC/APL/PIC/RSP_Driver/src/GetXCStatsCmd.h    |   2 +-
 .../PIC/RSP_Driver/src/HBAProtocolWrite.cc    |   2 +-
 MAC/APL/PIC/RSP_Driver/src/HBAProtocolWrite.h |   2 +-
 MAC/APL/PIC/RSP_Driver/src/HBAResultRead.cc   |   2 +-
 MAC/APL/PIC/RSP_Driver/src/HBAResultRead.h    |   2 +-
 MAC/APL/PIC/RSP_Driver/src/LatencyRead.cc     |   2 +-
 MAC/APL/PIC/RSP_Driver/src/LatencyRead.h      |   2 +-
 MAC/APL/PIC/RSP_Driver/src/RADWrite.cc        |   2 +-
 MAC/APL/PIC/RSP_Driver/src/RADWrite.h         |   2 +-
 MAC/APL/PIC/RSP_Driver/src/RCUCables.cc       |   2 +-
 MAC/APL/PIC/RSP_Driver/src/RCUCables.h        |   2 +-
 .../PIC/RSP_Driver/src/RCUProtocolWrite.cc    |   2 +-
 MAC/APL/PIC/RSP_Driver/src/RCUProtocolWrite.h |   2 +-
 MAC/APL/PIC/RSP_Driver/src/RCURead.cc         |   2 +-
 MAC/APL/PIC/RSP_Driver/src/RCURead.h          |   2 +-
 MAC/APL/PIC/RSP_Driver/src/RCUResultRead.cc   |   2 +-
 MAC/APL/PIC/RSP_Driver/src/RCUResultRead.h    |   2 +-
 MAC/APL/PIC/RSP_Driver/src/RCUWrite.cc        |   2 +-
 MAC/APL/PIC/RSP_Driver/src/RCUWrite.h         |   2 +-
 MAC/APL/PIC/RSP_Driver/src/RSPDriver.cc       |   2 +-
 MAC/APL/PIC/RSP_Driver/src/RSPDriver.h        |   2 +-
 MAC/APL/PIC/RSP_Driver/src/RSUWrite.cc        |   2 +-
 MAC/APL/PIC/RSP_Driver/src/RSUWrite.h         |   2 +-
 MAC/APL/PIC/RSP_Driver/src/RawBlockRead.cc    |   2 +-
 MAC/APL/PIC/RSP_Driver/src/RawBlockRead.h     |   2 +-
 MAC/APL/PIC/RSP_Driver/src/RawBlockWrite.cc   |   2 +-
 MAC/APL/PIC/RSP_Driver/src/RawBlockWrite.h    |   2 +-
 MAC/APL/PIC/RSP_Driver/src/RawEvent.cc        |   2 +-
 MAC/APL/PIC/RSP_Driver/src/RawEvent.h         |   2 +-
 MAC/APL/PIC/RSP_Driver/src/ReadHBACmd.cc      |   2 +-
 MAC/APL/PIC/RSP_Driver/src/ReadHBACmd.h       |   2 +-
 MAC/APL/PIC/RSP_Driver/src/ReadReg.cc         |   2 +-
 MAC/APL/PIC/RSP_Driver/src/ReadReg.h          |   2 +-
 MAC/APL/PIC/RSP_Driver/src/RefCount.h         |   2 +-
 MAC/APL/PIC/RSP_Driver/src/SDOModeRead.cc     |   2 +-
 MAC/APL/PIC/RSP_Driver/src/SDOModeRead.h      |   2 +-
 MAC/APL/PIC/RSP_Driver/src/SDOModeWrite.cc    |   2 +-
 MAC/APL/PIC/RSP_Driver/src/SDOModeWrite.h     |   2 +-
 MAC/APL/PIC/RSP_Driver/src/SDORead.cc         |   2 +-
 MAC/APL/PIC/RSP_Driver/src/SDORead.h          |   2 +-
 MAC/APL/PIC/RSP_Driver/src/SDOWrite.cc        |   2 +-
 MAC/APL/PIC/RSP_Driver/src/SDOWrite.h         |   2 +-
 MAC/APL/PIC/RSP_Driver/src/SSRead.cc          |   2 +-
 MAC/APL/PIC/RSP_Driver/src/SSRead.h           |   2 +-
 MAC/APL/PIC/RSP_Driver/src/SSWrite.cc         |   2 +-
 MAC/APL/PIC/RSP_Driver/src/SSWrite.h          |   2 +-
 MAC/APL/PIC/RSP_Driver/src/Scheduler.cc       |   2 +-
 MAC/APL/PIC/RSP_Driver/src/Scheduler.h        |   2 +-
 MAC/APL/PIC/RSP_Driver/src/Sequencer.cc       |   2 +-
 MAC/APL/PIC/RSP_Driver/src/Sequencer.h        |   2 +-
 MAC/APL/PIC/RSP_Driver/src/SerdesBuffer.cc    |   2 +-
 MAC/APL/PIC/RSP_Driver/src/SerdesBuffer.h     |   2 +-
 MAC/APL/PIC/RSP_Driver/src/SerdesRead.cc      |   2 +-
 MAC/APL/PIC/RSP_Driver/src/SerdesRead.h       |   2 +-
 MAC/APL/PIC/RSP_Driver/src/SerdesWrite.cc     |   2 +-
 MAC/APL/PIC/RSP_Driver/src/SerdesWrite.h      |   2 +-
 MAC/APL/PIC/RSP_Driver/src/SetBitModeCmd.cc   |   2 +-
 MAC/APL/PIC/RSP_Driver/src/SetBitModeCmd.h    |   2 +-
 MAC/APL/PIC/RSP_Driver/src/SetBypassCmd.cc    |   2 +-
 MAC/APL/PIC/RSP_Driver/src/SetBypassCmd.h     |   2 +-
 MAC/APL/PIC/RSP_Driver/src/SetClocksCmd.cc    |   2 +-
 MAC/APL/PIC/RSP_Driver/src/SetClocksCmd.h     |   2 +-
 .../PIC/RSP_Driver/src/SetDatastreamCmd.cc    |   2 +-
 MAC/APL/PIC/RSP_Driver/src/SetDatastreamCmd.h |   2 +-
 MAC/APL/PIC/RSP_Driver/src/SetHBACmd.cc       |   2 +-
 MAC/APL/PIC/RSP_Driver/src/SetHBACmd.h        |   2 +-
 MAC/APL/PIC/RSP_Driver/src/SetRCUCmd.cc       |   2 +-
 MAC/APL/PIC/RSP_Driver/src/SetRCUCmd.h        |   2 +-
 MAC/APL/PIC/RSP_Driver/src/SetRSUCmd.cc       |   2 +-
 MAC/APL/PIC/RSP_Driver/src/SetRSUCmd.h        |   2 +-
 MAC/APL/PIC/RSP_Driver/src/SetRawBlockCmd.cc  |   2 +-
 MAC/APL/PIC/RSP_Driver/src/SetRawBlockCmd.h   |   2 +-
 MAC/APL/PIC/RSP_Driver/src/SetSDOCmd.cc       |   2 +-
 MAC/APL/PIC/RSP_Driver/src/SetSDOCmd.h        |   2 +-
 MAC/APL/PIC/RSP_Driver/src/SetSDOModeCmd.cc   |   2 +-
 MAC/APL/PIC/RSP_Driver/src/SetSDOModeCmd.h    |   2 +-
 MAC/APL/PIC/RSP_Driver/src/SetSplitterCmd.cc  |   2 +-
 MAC/APL/PIC/RSP_Driver/src/SetSplitterCmd.h   |   2 +-
 MAC/APL/PIC/RSP_Driver/src/SetSubbandsCmd.cc  |   2 +-
 MAC/APL/PIC/RSP_Driver/src/SetSubbandsCmd.h   |   2 +-
 MAC/APL/PIC/RSP_Driver/src/SetSwapxyCmd.cc    |   2 +-
 MAC/APL/PIC/RSP_Driver/src/SetSwapxyCmd.h     |   2 +-
 MAC/APL/PIC/RSP_Driver/src/SetTBBCmd.cc       |   2 +-
 MAC/APL/PIC/RSP_Driver/src/SetTBBCmd.h        |   2 +-
 MAC/APL/PIC/RSP_Driver/src/SetWGCmd.cc        |   2 +-
 MAC/APL/PIC/RSP_Driver/src/SetWGCmd.h         |   2 +-
 MAC/APL/PIC/RSP_Driver/src/SetWeightsCmd.cc   |   2 +-
 MAC/APL/PIC/RSP_Driver/src/SetWeightsCmd.h    |   2 +-
 MAC/APL/PIC/RSP_Driver/src/SstRead.cc         |   2 +-
 MAC/APL/PIC/RSP_Driver/src/SstRead.h          |   2 +-
 MAC/APL/PIC/RSP_Driver/src/StationSettings.cc |   2 +-
 MAC/APL/PIC/RSP_Driver/src/StationSettings.h  |   2 +-
 MAC/APL/PIC/RSP_Driver/src/StatusRead.cc      |   2 +-
 MAC/APL/PIC/RSP_Driver/src/StatusRead.h       |   2 +-
 MAC/APL/PIC/RSP_Driver/src/SyncAction.cc      |   2 +-
 MAC/APL/PIC/RSP_Driver/src/SyncAction.h       |   2 +-
 MAC/APL/PIC/RSP_Driver/src/TBBBandselWrite.cc |   2 +-
 MAC/APL/PIC/RSP_Driver/src/TBBBandselWrite.h  |   2 +-
 .../PIC/RSP_Driver/src/TBBSettingsWrite.cc    |   2 +-
 MAC/APL/PIC/RSP_Driver/src/TBBSettingsWrite.h |   2 +-
 .../PIC/RSP_Driver/src/TDSProtocolWrite.cc    |   2 +-
 MAC/APL/PIC/RSP_Driver/src/TDSProtocolWrite.h |   2 +-
 MAC/APL/PIC/RSP_Driver/src/TDSResultRead.cc   |   2 +-
 MAC/APL/PIC/RSP_Driver/src/TDSResultRead.h    |   2 +-
 MAC/APL/PIC/RSP_Driver/src/TDSResultWrite.cc  |   2 +-
 MAC/APL/PIC/RSP_Driver/src/TDSResultWrite.h   |   2 +-
 MAC/APL/PIC/RSP_Driver/src/TDSStatusRead.cc   |   2 +-
 MAC/APL/PIC/RSP_Driver/src/TDSStatusRead.h    |   2 +-
 MAC/APL/PIC/RSP_Driver/src/TDSStatusWrite.cc  |   2 +-
 MAC/APL/PIC/RSP_Driver/src/TDSStatusWrite.h   |   2 +-
 MAC/APL/PIC/RSP_Driver/src/TDSi2cdefs.h       |   2 +-
 MAC/APL/PIC/RSP_Driver/src/TimestampWrite.cc  |   2 +-
 MAC/APL/PIC/RSP_Driver/src/TimestampWrite.h   |   2 +-
 MAC/APL/PIC/RSP_Driver/src/UpdBitModeCmd.cc   |   2 +-
 MAC/APL/PIC/RSP_Driver/src/UpdBitModeCmd.h    |   2 +-
 MAC/APL/PIC/RSP_Driver/src/UpdClocksCmd.cc    |   2 +-
 MAC/APL/PIC/RSP_Driver/src/UpdClocksCmd.h     |   2 +-
 MAC/APL/PIC/RSP_Driver/src/UpdHBACmd.cc       |   2 +-
 MAC/APL/PIC/RSP_Driver/src/UpdHBACmd.h        |   2 +-
 MAC/APL/PIC/RSP_Driver/src/UpdRCUCmd.cc       |   2 +-
 MAC/APL/PIC/RSP_Driver/src/UpdRCUCmd.h        |   2 +-
 .../PIC/RSP_Driver/src/UpdRegisterStateCmd.cc |   2 +-
 .../PIC/RSP_Driver/src/UpdRegisterStateCmd.h  |   2 +-
 MAC/APL/PIC/RSP_Driver/src/UpdSplitterCmd.cc  |   2 +-
 MAC/APL/PIC/RSP_Driver/src/UpdSplitterCmd.h   |   2 +-
 MAC/APL/PIC/RSP_Driver/src/UpdStatsCmd.cc     |   2 +-
 MAC/APL/PIC/RSP_Driver/src/UpdStatsCmd.h      |   2 +-
 MAC/APL/PIC/RSP_Driver/src/UpdStatusCmd.cc    |   2 +-
 MAC/APL/PIC/RSP_Driver/src/UpdStatusCmd.h     |   2 +-
 MAC/APL/PIC/RSP_Driver/src/UpdSubbandsCmd.cc  |   2 +-
 MAC/APL/PIC/RSP_Driver/src/UpdSubbandsCmd.h   |   2 +-
 MAC/APL/PIC/RSP_Driver/src/UpdTDStatusCmd.cc  |   2 +-
 MAC/APL/PIC/RSP_Driver/src/UpdTDStatusCmd.h   |   2 +-
 MAC/APL/PIC/RSP_Driver/src/UpdXCStatsCmd.cc   |   2 +-
 MAC/APL/PIC/RSP_Driver/src/UpdXCStatsCmd.h    |   2 +-
 MAC/APL/PIC/RSP_Driver/src/VersionsRead.cc    |   2 +-
 MAC/APL/PIC/RSP_Driver/src/VersionsRead.h     |   2 +-
 MAC/APL/PIC/RSP_Driver/src/WGRead.cc          |   2 +-
 MAC/APL/PIC/RSP_Driver/src/WGRead.h           |   2 +-
 MAC/APL/PIC/RSP_Driver/src/WGWrite.cc         |   2 +-
 MAC/APL/PIC/RSP_Driver/src/WGWrite.h          |   2 +-
 MAC/APL/PIC/RSP_Driver/src/WriteReg.cc        |   2 +-
 MAC/APL/PIC/RSP_Driver/src/WriteReg.h         |   2 +-
 MAC/APL/PIC/RSP_Driver/src/XWWrite.cc         |   2 +-
 MAC/APL/PIC/RSP_Driver/src/XWWrite.h          |   2 +-
 MAC/APL/PIC/RSP_Driver/src/XstRead.cc         |   2 +-
 MAC/APL/PIC/RSP_Driver/src/XstRead.h          |   2 +-
 MAC/APL/PIC/RSP_Driver/src/rspctl.cc          |   2 +-
 MAC/APL/PIC/RSP_Driver/src/rspctl.h           |   2 +-
 MAC/APL/PIC/RSP_Driver/src/rspd.ul.in         |   2 +-
 MAC/APL/PIC/RSP_Driver/test/EPAStub.cc        |   2 +-
 MAC/APL/PIC/RSP_Driver/test/EPAStub.h         |   2 +-
 MAC/APL/PIC/RSP_Driver/test/RSPTest.cc        |   2 +-
 MAC/APL/PIC/RSP_Driver/test/RSPTest.h         |   2 +-
 MAC/APL/PIC/RSP_Driver/test/RSPTestSuite.h    |   2 +-
 .../PIC/RSP_Driver/test/tCableAttenuation.cc  |   2 +-
 MAC/APL/PIC/RSP_Driver/test/tRCUCables.cc     |   2 +-
 .../APL/RSP_Protocol/AllRegisterState.h       |   2 +-
 .../include/APL/RSP_Protocol/BeamletWeights.h |   2 +-
 .../include/APL/RSP_Protocol/Bitmode.h        |   2 +-
 .../include/APL/RSP_Protocol/BypassSettings.h |   2 +-
 .../include/APL/RSP_Protocol/HBASettings.h    |   2 +-
 .../include/APL/RSP_Protocol/Latency.h        |   2 +-
 .../include/APL/RSP_Protocol/MEPData.h        |   2 +-
 .../include/APL/RSP_Protocol/MEPHeader.h      |   2 +-
 .../include/APL/RSP_Protocol/RCUSettings.h    |   2 +-
 .../include/APL/RSP_Protocol/RSUSettings.h    |   2 +-
 .../include/APL/RSP_Protocol/SDOMode.h        |   2 +-
 .../include/APL/RSP_Protocol/SDOSelection.h   |   2 +-
 .../include/APL/RSP_Protocol/SPUStatus.h      |   2 +-
 .../include/APL/RSP_Protocol/Statistics.h     |   2 +-
 .../APL/RSP_Protocol/SubbandSelection.h       |   2 +-
 .../include/APL/RSP_Protocol/SystemStatus.h   |   2 +-
 .../include/APL/RSP_Protocol/TBBSettings.h    |   2 +-
 .../include/APL/RSP_Protocol/TDStatus.h       |   2 +-
 .../include/APL/RSP_Protocol/Versions.h       |   2 +-
 .../include/APL/RSP_Protocol/WGSettings.h     |   2 +-
 .../include/APL/RSP_Protocol/XCStatistics.h   |   2 +-
 .../PIC/RSP_Protocol/src/AllRegisterState.cc  |   2 +-
 .../PIC/RSP_Protocol/src/BeamletWeights.cc    |   2 +-
 MAC/APL/PIC/RSP_Protocol/src/Bitmode.cc       |   2 +-
 .../PIC/RSP_Protocol/src/BypassSettings.cc    |   2 +-
 MAC/APL/PIC/RSP_Protocol/src/HBASettings.cc   |   2 +-
 MAC/APL/PIC/RSP_Protocol/src/Latency.cc       |   2 +-
 MAC/APL/PIC/RSP_Protocol/src/MEPData.cc       |   2 +-
 MAC/APL/PIC/RSP_Protocol/src/MEPHeader.cc     |   2 +-
 MAC/APL/PIC/RSP_Protocol/src/RCUSettings.cc   |   2 +-
 MAC/APL/PIC/RSP_Protocol/src/RSUSettings.cc   |   2 +-
 MAC/APL/PIC/RSP_Protocol/src/SDOMode.cc       |   2 +-
 MAC/APL/PIC/RSP_Protocol/src/SDOSelection.cc  |   2 +-
 MAC/APL/PIC/RSP_Protocol/src/SPUStatus.cc     |   2 +-
 MAC/APL/PIC/RSP_Protocol/src/Statistics.cc    |   2 +-
 .../PIC/RSP_Protocol/src/SubbandSelection.cc  |   2 +-
 MAC/APL/PIC/RSP_Protocol/src/SystemStatus.cc  |   2 +-
 MAC/APL/PIC/RSP_Protocol/src/TBBSettings.cc   |   2 +-
 MAC/APL/PIC/RSP_Protocol/src/TDStatus.cc      |   2 +-
 MAC/APL/PIC/RSP_Protocol/src/Versions.cc      |   2 +-
 MAC/APL/PIC/RSP_Protocol/src/WGSettings.cc    |   2 +-
 MAC/APL/PIC/RSP_Protocol/src/XCStatistics.cc  |   2 +-
 MAC/APL/PIC/RSP_Protocol/test/tRCUSettings.cc |   2 +-
 MAC/APL/PIC/TBB_Driver/src/AllocCmd.cc        |   2 +-
 MAC/APL/PIC/TBB_Driver/src/AllocCmd.h         |   2 +-
 MAC/APL/PIC/TBB_Driver/src/ArpCmd.cc          |   2 +-
 MAC/APL/PIC/TBB_Driver/src/ArpCmd.h           |   2 +-
 MAC/APL/PIC/TBB_Driver/src/ArpModeCmd.cc      |   2 +-
 MAC/APL/PIC/TBB_Driver/src/ArpModeCmd.h       |   2 +-
 MAC/APL/PIC/TBB_Driver/src/BoardCmdHandler.cc |   2 +-
 MAC/APL/PIC/TBB_Driver/src/BoardCmdHandler.h  |   2 +-
 MAC/APL/PIC/TBB_Driver/src/CepDelayCmd.cc     |   2 +-
 MAC/APL/PIC/TBB_Driver/src/CepDelayCmd.h      |   2 +-
 MAC/APL/PIC/TBB_Driver/src/CepStatusCmd.cc    |   2 +-
 MAC/APL/PIC/TBB_Driver/src/CepStatusCmd.h     |   2 +-
 MAC/APL/PIC/TBB_Driver/src/ClearCmd.cc        |   2 +-
 MAC/APL/PIC/TBB_Driver/src/ClearCmd.h         |   2 +-
 MAC/APL/PIC/TBB_Driver/src/Command.cc         |   2 +-
 MAC/APL/PIC/TBB_Driver/src/Command.h          |   2 +-
 MAC/APL/PIC/TBB_Driver/src/ConfigCmd.cc       |   2 +-
 MAC/APL/PIC/TBB_Driver/src/ConfigCmd.h        |   2 +-
 MAC/APL/PIC/TBB_Driver/src/DriverSettings.cc  |   2 +-
 MAC/APL/PIC/TBB_Driver/src/DriverSettings.h   |   2 +-
 MAC/APL/PIC/TBB_Driver/src/ErasefCmd.cc       |   2 +-
 MAC/APL/PIC/TBB_Driver/src/ErasefCmd.h        |   2 +-
 MAC/APL/PIC/TBB_Driver/src/FreeCmd.cc         |   2 +-
 MAC/APL/PIC/TBB_Driver/src/FreeCmd.h          |   2 +-
 MAC/APL/PIC/TBB_Driver/src/ImageInfoCmd.cc    |   2 +-
 MAC/APL/PIC/TBB_Driver/src/ImageInfoCmd.h     |   2 +-
 MAC/APL/PIC/TBB_Driver/src/MsgHandler.cc      |   2 +-
 MAC/APL/PIC/TBB_Driver/src/MsgHandler.h       |   2 +-
 MAC/APL/PIC/TBB_Driver/src/PageperiodCmd.cc   |   2 +-
 MAC/APL/PIC/TBB_Driver/src/PageperiodCmd.h    |   2 +-
 MAC/APL/PIC/TBB_Driver/src/RawEvent.cc        |   2 +-
 MAC/APL/PIC/TBB_Driver/src/RawEvent.h         |   2 +-
 MAC/APL/PIC/TBB_Driver/src/ReadCmd.cc         |   2 +-
 MAC/APL/PIC/TBB_Driver/src/ReadCmd.h          |   2 +-
 MAC/APL/PIC/TBB_Driver/src/ReadfCmd.cc        |   2 +-
 MAC/APL/PIC/TBB_Driver/src/ReadfCmd.h         |   2 +-
 MAC/APL/PIC/TBB_Driver/src/ReadrCmd.cc        |   2 +-
 MAC/APL/PIC/TBB_Driver/src/ReadrCmd.h         |   2 +-
 MAC/APL/PIC/TBB_Driver/src/ReadwCmd.cc        |   2 +-
 MAC/APL/PIC/TBB_Driver/src/ReadwCmd.h         |   2 +-
 MAC/APL/PIC/TBB_Driver/src/ReadxCmd.cc        |   2 +-
 MAC/APL/PIC/TBB_Driver/src/ReadxCmd.h         |   2 +-
 MAC/APL/PIC/TBB_Driver/src/RecordCmd.cc       |   2 +-
 MAC/APL/PIC/TBB_Driver/src/RecordCmd.h        |   2 +-
 MAC/APL/PIC/TBB_Driver/src/ResetCmd.cc        |   2 +-
 MAC/APL/PIC/TBB_Driver/src/ResetCmd.h         |   2 +-
 MAC/APL/PIC/TBB_Driver/src/SizeCmd.cc         |   2 +-
 MAC/APL/PIC/TBB_Driver/src/SizeCmd.h          |   2 +-
 MAC/APL/PIC/TBB_Driver/src/StatusCmd.cc       |   2 +-
 MAC/APL/PIC/TBB_Driver/src/StatusCmd.h        |   2 +-
 MAC/APL/PIC/TBB_Driver/src/StopCepCmd.cc      |   2 +-
 MAC/APL/PIC/TBB_Driver/src/StopCepCmd.h       |   2 +-
 MAC/APL/PIC/TBB_Driver/src/StopCmd.cc         |   2 +-
 MAC/APL/PIC/TBB_Driver/src/StopCmd.h          |   2 +-
 MAC/APL/PIC/TBB_Driver/src/TBBDriver.cc       |   2 +-
 MAC/APL/PIC/TBB_Driver/src/TBBDriver.h        |   2 +-
 MAC/APL/PIC/TBB_Driver/src/TempLimitCmd.cc    |   2 +-
 MAC/APL/PIC/TBB_Driver/src/TempLimitCmd.h     |   2 +-
 MAC/APL/PIC/TBB_Driver/src/TrigCoefCmd.cc     |   2 +-
 MAC/APL/PIC/TBB_Driver/src/TrigCoefCmd.h      |   2 +-
 MAC/APL/PIC/TBB_Driver/src/TrigCoefSameCmd.cc |   2 +-
 MAC/APL/PIC/TBB_Driver/src/TrigCoefSameCmd.h  |   2 +-
 MAC/APL/PIC/TBB_Driver/src/TrigGenCmd.cc      |   2 +-
 MAC/APL/PIC/TBB_Driver/src/TrigGenCmd.h       |   2 +-
 MAC/APL/PIC/TBB_Driver/src/TrigInfoCmd.cc     |   2 +-
 MAC/APL/PIC/TBB_Driver/src/TrigInfoCmd.h      |   2 +-
 MAC/APL/PIC/TBB_Driver/src/TrigReleaseCmd.cc  |   2 +-
 MAC/APL/PIC/TBB_Driver/src/TrigReleaseCmd.h   |   2 +-
 MAC/APL/PIC/TBB_Driver/src/TrigSetupCmd.cc    |   2 +-
 MAC/APL/PIC/TBB_Driver/src/TrigSetupCmd.h     |   2 +-
 .../PIC/TBB_Driver/src/TrigSetupSameCmd.cc    |   2 +-
 MAC/APL/PIC/TBB_Driver/src/TrigSetupSameCmd.h |   2 +-
 MAC/APL/PIC/TBB_Driver/src/UdpIpTools.h       |   2 +-
 MAC/APL/PIC/TBB_Driver/src/VersionCmd.cc      |   2 +-
 MAC/APL/PIC/TBB_Driver/src/VersionCmd.h       |   2 +-
 MAC/APL/PIC/TBB_Driver/src/WatchDogCmd.cc     |   2 +-
 MAC/APL/PIC/TBB_Driver/src/WatchDogCmd.h      |   2 +-
 MAC/APL/PIC/TBB_Driver/src/WritefCmd.cc       |   2 +-
 MAC/APL/PIC/TBB_Driver/src/WritefCmd.h        |   2 +-
 MAC/APL/PIC/TBB_Driver/src/WriterCmd.cc       |   2 +-
 MAC/APL/PIC/TBB_Driver/src/WriterCmd.h        |   2 +-
 MAC/APL/PIC/TBB_Driver/src/WritewCmd.cc       |   2 +-
 MAC/APL/PIC/TBB_Driver/src/WritewCmd.h        |   2 +-
 MAC/APL/PIC/TBB_Driver/src/XXXCmd.cc          |   2 +-
 MAC/APL/PIC/TBB_Driver/src/XXXCmd.h           |   2 +-
 MAC/APL/PIC/TBB_Driver/src/tbbctl.cc          |   2 +-
 MAC/APL/PIC/TBB_Driver/src/tbbctl.h           |   2 +-
 MAC/APL/PIC/TBB_Driver/test/StubRawEvent.cc   |   2 +-
 MAC/APL/PIC/TBB_Driver/test/StubRawEvent.h    |   2 +-
 MAC/APL/PIC/TBB_Driver/test/TBBTest.cc        |   2 +-
 MAC/APL/PIC/TBB_Driver/test/TBBTest.h         |   2 +-
 MAC/APL/PIC/TBB_Driver/test/TBBTestSuite.h    |   2 +-
 MAC/APL/PIC/TBB_Driver/test/TPStub.cc         |   2 +-
 MAC/APL/PIC/TBB_Driver/test/TPStub.h          |   2 +-
 .../include/APL/RTCCommon/MarshallBlitz.h     |   2 +-
 .../include/APL/RTCCommon/Observer.h          |   2 +-
 .../include/APL/RTCCommon/PSAccess.h          |   2 +-
 .../include/APL/RTCCommon/RegisterState.h     |   2 +-
 .../RTCCommon/include/APL/RTCCommon/Subject.h |   2 +-
 .../include/APL/RTCCommon/TestSuite.h         |   2 +-
 .../include/APL/RTCCommon/Timestamp.h         |   2 +-
 .../include/APL/RTCCommon/daemonize.h         |   2 +-
 MAC/APL/RTCCommon/src/RegisterState.cc        |   2 +-
 MAC/APL/RTCCommon/src/Subject.cc              |   2 +-
 MAC/APL/RTCCommon/src/Timestamp.cc            |   2 +-
 MAC/APL/RTCCommon/test/tBlitz.cc              |   2 +-
 MAC/APL/RTCCommon/test/tMarshallBlitz.cc      |   2 +-
 MAC/APL/RTCCommon/test/tTimestamp.cc          |   2 +-
 .../include/APL/RTDBCommon/ClaimMgrTask.h     |   2 +-
 .../include/APL/RTDBCommon/RTDButilities.h    |   2 +-
 MAC/APL/RTDBCommon/src/CM_Protocol.prot       |   2 +-
 MAC/APL/RTDBCommon/src/ClaimMgrTask.cc        |   2 +-
 MAC/APL/RTDBCommon/src/RTDButilities.cc       |   2 +-
 MAC/APL/RTDBCommon/src/disabledRCUlist.cc     |   2 +-
 MAC/APL/RTDBCommon/src/disabledRCUlist.h      |   2 +-
 MAC/APL/RTDBCommon/src/setObjectState.cc      |   2 +-
 MAC/APL/RTDBCommon/src/setObjectState.h       |   2 +-
 MAC/APL/RTDBCommon/test/tClaimManager.cc      |   2 +-
 MAC/APL/RTDBCommon/test/tClaimManager.h       |   2 +-
 MAC/APL/RTDBCommon/test/tRTDButilities.cc     |   2 +-
 MAC/APL/RTDBCommon/test/tRTDButilities.h      |   2 +-
 .../StationCU/src/BeamControl/BeamControl.cc  |   2 +-
 .../StationCU/src/BeamControl/BeamControl.h   |   2 +-
 .../src/BeamControl/BeamControlMain.cc        |   2 +-
 .../CalibrationControl/CalibrationControl.cc  |   2 +-
 .../CalibrationControl/CalibrationControl.h   |   2 +-
 .../CalibrationControlMain.cc                 |   2 +-
 .../src/ClockControl/ClockControl.cc          |   2 +-
 .../StationCU/src/ClockControl/ClockControl.h |   2 +-
 .../src/ClockControl/ClockControlMain.cc      |   2 +-
 MAC/APL/StationCU/src/ClockControl/clkctl.cc  |   2 +-
 MAC/APL/StationCU/src/ClockControl/clkctl.h   |   2 +-
 .../src/ClockProtocol/Clock_Protocol.prot     |   2 +-
 .../src/HardwareMonitor/ECMonitor.cc          |   2 +-
 .../StationCU/src/HardwareMonitor/ECMonitor.h |   2 +-
 .../HardwareMonitor/HardwareMonitorMain.cc    |   2 +-
 .../src/HardwareMonitor/RCUConstants.h        |   2 +-
 .../src/HardwareMonitor/RSPMonitor.cc         |   2 +-
 .../src/HardwareMonitor/RSPMonitor.h          |   2 +-
 .../src/HardwareMonitor/TBBMonitor.cc         |   2 +-
 .../src/HardwareMonitor/TBBMonitor.h          |   2 +-
 .../StationCU/src/StationControl/ActiveObs.cc |   2 +-
 .../StationCU/src/StationControl/ActiveObs.h  |   2 +-
 .../src/StationControl/StationControl.cc      |   2 +-
 .../src/StationControl/StationControl.h       |   2 +-
 .../src/StationControl/StationControlMain.cc  |   2 +-
 .../StationCU/src/TBBControl/TBBControl.cc    |   2 +-
 MAC/APL/StationCU/src/TBBControl/TBBControl.h |   2 +-
 .../src/TBBControl/TBBControlMain.cc          |   2 +-
 .../src/TBBControl/TBBObservation.cc          |   2 +-
 .../StationCU/src/TBBControl/TBBObservation.h |   2 +-
 MAC/APL/StationCU/src/TBBControl/trigctl.cc   |   2 +-
 MAC/APL/StationCU/src/TBBControl/trigctl.h    |   2 +-
 MAC/APL/TestCtlr/src/CodeLoggingTest.cc       |   2 +-
 MAC/APL/TestCtlr/src/ControllerMenu.cc        |   2 +-
 MAC/APL/TestCtlr/src/ControllerMenu.h         |   2 +-
 MAC/APL/TestCtlr/src/ControllerMenuMain.cc    |   2 +-
 MAC/APL/TestCtlr/src/TestController.cc        |   2 +-
 MAC/APL/TestCtlr/src/TestController.h         |   2 +-
 MAC/APL/TestCtlr/src/TestControllerMain.cc    |   2 +-
 MAC/APL/TestSuite/include/TestSuite/suite.h   |   2 +-
 MAC/APL/TestSuite/include/TestSuite/test.h    |   2 +-
 MAC/APL/TestSuite/src/suite.cpp               |   2 +-
 MAC/APL/TestSuite/src/test.cpp                |   2 +-
 MAC/APL/VHECR/include/VHECR/TBBReadCmd.h      |   2 +-
 MAC/APL/VHECR/include/VHECR/TBBTrigger.h      |   2 +-
 MAC/APL/VHECR/include/VHECR/VHECRTask.h       |   2 +-
 MAC/APL/VHECR/include/VHECR/VHECRsettings.h   |   2 +-
 MAC/APL/VHECR/src/TBBReadCmd.cc               |   2 +-
 MAC/APL/VHECR/src/TBBTrigger.cc               |   2 +-
 MAC/APL/VHECR/src/VHECRTask.cc                |   2 +-
 MAC/APL/VHECR/src/VHECRsettings.cc            |   2 +-
 MAC/APL/VHECR/test/VHECRtest.cc               |   2 +-
 .../Coordinates/add_field_rotation_func.sql   |   2 +-
 .../data/Coordinates/add_gen_coord_func.sql   |   2 +-
 .../data/Coordinates/add_hba_deltas_func.sql  |   2 +-
 .../Coordinates/add_normal_vector_func.sql    |   2 +-
 .../data/Coordinates/add_object_func.sql      |   2 +-
 .../Coordinates/add_reference_coord_func.sql  |   2 +-
 .../Coordinates/add_rotation_matrix_func.sql  |   2 +-
 .../Coordinates/create_CDB_base_tables.sql    |   2 +-
 .../data/Coordinates/create_CDB_tables.sql    |   2 +-
 .../data/Coordinates/create_CDB_types.sql     |   2 +-
 .../Coordinates/get_field_rotation_func.sql   |   2 +-
 .../data/Coordinates/get_gen_coord_func.sql   |   2 +-
 .../data/Coordinates/get_hba_deltas_func.sql  |   2 +-
 .../Coordinates/get_normal_vector_func.sql    |   2 +-
 .../data/Coordinates/get_objects_func.sql     |   2 +-
 .../data/Coordinates/get_ref_objects_func.sql |   2 +-
 .../Coordinates/get_rotation_matrix_func.sql  |   2 +-
 .../get_transformation_info_func.sql          |   2 +-
 MAC/Deployment/data/OTDB/create_OTDB_comps    |   2 +-
 MAC/Deployment/data/OTDB/loadComponents       |   2 +-
 MAC/Deployment/data/OTDB/loadPICtree          |   2 +-
 MAC/Deployment/data/PVSS/bin/create_db_files  |   2 +-
 MAC/Deployment/data/bin/PVSS2SAS.cc           |   2 +-
 MAC/Deployment/data/bin/load_OTDB_comps.cc    |   2 +-
 MAC/Deployment/data/bin/load_PICtree.cc       |   2 +-
 MAC/Drivers/spid/src/spid.c                   |   2 +-
 MAC/Drivers/spid/tools/ClockSim.c             |   2 +-
 MAC/Drivers/spid/tools/SPIDreset.c            |   2 +-
 MAC/GCF/LogSys/CLP/src/CLPMain.cc             |   2 +-
 .../LogSys/CLP/src/CodeLoggingProcessor.cc    |   2 +-
 MAC/GCF/LogSys/CLP/src/CodeLoggingProcessor.h |   2 +-
 MAC/GCF/LogSys/CLP/src/PropertyProxy.cc       |   2 +-
 MAC/GCF/LogSys/CLP/src/PropertyProxy.h        |   2 +-
 .../LogSys/KVLogSys/src/CEPKeyValueLogger.cc  |   2 +-
 .../LogSys/KVLogSys/src/GCF_KeyValueLogger.cc |   2 +-
 MAC/GCF/LogSys/KVLogSys/src/KVLDMain.cc       |   2 +-
 MAC/GCF/LogSys/KVLogSys/src/KVLDefines.h      |   2 +-
 MAC/GCF/LogSys/KVLogSys/src/KVLMMain.cc       |   2 +-
 MAC/GCF/LogSys/KVLogSys/src/KVLUtils.cc       |   2 +-
 MAC/GCF/LogSys/KVLogSys/src/KVLUtils.h        |   2 +-
 .../KVLogSys/src/KeyValueLoggerDaemon.cc      |   2 +-
 .../KVLogSys/src/KeyValueLoggerDaemon.h       |   2 +-
 .../KVLogSys/src/KeyValueLoggerMaster.cc      |   2 +-
 .../KVLogSys/src/KeyValueLoggerMaster.h       |   2 +-
 MAC/GCF/LogSys/KVLogSys/src/PropertyLogger.cc |   2 +-
 MAC/GCF/LogSys/KVLogSys/src/PropertyLogger.h  |   2 +-
 MAC/GCF/LogSys/KVLogSys/test/tKVLlogger.cc    |   2 +-
 .../include/GCF/LogSys/CEPKeyValueLogger.h    |   2 +-
 .../include/GCF/LogSys/GCF_KeyValueLogger.h   |   2 +-
 MAC/GCF/PVSS/include/GCF/PVSS/GCF_Defines.h   |   2 +-
 MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVBlob.h    |   2 +-
 MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVBool.h    |   2 +-
 MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVChar.h    |   2 +-
 .../PVSS/include/GCF/PVSS/GCF_PVDateTime.h    |   2 +-
 MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVDouble.h  |   2 +-
 MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVDynArr.h  |   2 +-
 MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVInteger.h |   2 +-
 MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVString.h  |   2 +-
 MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVTypes.h   |   2 +-
 .../PVSS/include/GCF/PVSS/GCF_PVUnsigned.h    |   2 +-
 MAC/GCF/PVSS/include/GCF/PVSS/GCF_PValue.h    |   2 +-
 MAC/GCF/PVSS/include/GCF/PVSS/PVSSinfo.h      |   2 +-
 MAC/GCF/PVSS/include/GCF/PVSS/PVSSresponse.h  |   2 +-
 MAC/GCF/PVSS/include/GCF/PVSS/PVSSresult.h    |   2 +-
 MAC/GCF/PVSS/include/GCF/PVSS/PVSSservice.h   |   2 +-
 MAC/GCF/PVSS/src/GCF_DynTypes.h               |   2 +-
 MAC/GCF/PVSS/src/GCF_PVBlob.cc                |   2 +-
 MAC/GCF/PVSS/src/GCF_PVBool.cc                |   2 +-
 MAC/GCF/PVSS/src/GCF_PVChar.cc                |   2 +-
 MAC/GCF/PVSS/src/GCF_PVDateTime.cc            |   2 +-
 MAC/GCF/PVSS/src/GCF_PVDouble.cc              |   2 +-
 MAC/GCF/PVSS/src/GCF_PVDynArr.cc              |   2 +-
 MAC/GCF/PVSS/src/GCF_PVInteger.cc             |   2 +-
 MAC/GCF/PVSS/src/GCF_PVString.cc              |   2 +-
 MAC/GCF/PVSS/src/GCF_PVTypes.cc               |   2 +-
 MAC/GCF/PVSS/src/GCF_PVUnsigned.cc            |   2 +-
 MAC/GCF/PVSS/src/GCF_PValue.cc                |   2 +-
 MAC/GCF/PVSS/src/GSA_PvssApi.cc               |   2 +-
 MAC/GCF/PVSS/src/GSA_PvssApi.h                |   2 +-
 MAC/GCF/PVSS/src/GSA_Resources.cc             |   2 +-
 MAC/GCF/PVSS/src/GSA_Resources.h              |   2 +-
 MAC/GCF/PVSS/src/GSA_SCADAHandler.cc          |   2 +-
 MAC/GCF/PVSS/src/GSA_SCADAHandler.h           |   2 +-
 MAC/GCF/PVSS/src/GSA_WaitForAnswer.h          |   2 +-
 MAC/GCF/PVSS/src/PVSSinfo.cc                  |   2 +-
 MAC/GCF/PVSS/src/PVSSservice.cc               |   2 +-
 MAC/GCF/PVSS/test/PerformanceResponse.h       |   2 +-
 MAC/GCF/PVSS/test/Response.h                  |   2 +-
 MAC/GCF/PVSS/test/tGCFtypes.cc                |   2 +-
 MAC/GCF/PVSS/test/tMonitorState.cc            |   2 +-
 MAC/GCF/PVSS/test/tMonitorState.h             |   2 +-
 MAC/GCF/PVSS/test/tPVSSconnect.cc             |   2 +-
 MAC/GCF/PVSS/test/tPVSSinfo.cc                |   2 +-
 MAC/GCF/PVSS/test/tPVSSinfo.h                 |   2 +-
 MAC/GCF/PVSS/test/tPVSSservice.cc             |   2 +-
 MAC/GCF/PVSS/test/tPVSSservice.h              |   2 +-
 MAC/GCF/PVSS/test/tPerformance.cc             |   2 +-
 MAC/GCF/PVSS/test/tPerformance.h              |   2 +-
 MAC/GCF/RTDB/include/GCF/RTDB/DPservice.h     |   2 +-
 MAC/GCF/RTDB/include/GCF/RTDB/GCF_RTDBPort.h  |   2 +-
 .../RTDB/include/GCF/RTDB/RTDB_PropertySet.h  |   2 +-
 MAC/GCF/RTDB/src/DP_Protocol.prot             |   2 +-
 MAC/GCF/RTDB/src/DPanswer.cc                  |   2 +-
 MAC/GCF/RTDB/src/DPanswer.h                   |   2 +-
 MAC/GCF/RTDB/src/DPresponse.h                 |   2 +-
 MAC/GCF/RTDB/src/DPservice.cc                 |   2 +-
 MAC/GCF/RTDB/src/GCF_RTDBPort.cc              |   2 +-
 MAC/GCF/RTDB/src/PortResponse.h               |   2 +-
 MAC/GCF/RTDB/src/PropSetResponse.h            |   2 +-
 MAC/GCF/RTDB/src/RTDB_PropertySet.cc          |   2 +-
 MAC/GCF/RTDB/test/DPresponse.h                |   2 +-
 MAC/GCF/RTDB/test/RTDBPerfResp.h              |   2 +-
 MAC/GCF/RTDB/test/tDPservice.cc               |   2 +-
 MAC/GCF/RTDB/test/tDPservice.h                |   2 +-
 MAC/GCF/RTDB/test/tPerformanceReport.cc       |   2 +-
 MAC/GCF/RTDB/test/tPerformanceReport.h        |   2 +-
 MAC/GCF/RTDB/test/tPropertySet.cc             |   2 +-
 MAC/GCF/RTDB/test/tPropertySet.h              |   2 +-
 MAC/GCF/RTDB/test/tRTDBPerformance.cc         |   2 +-
 MAC/GCF/RTDB/test/tRTDBPerformance.h          |   2 +-
 MAC/GCF/RTDB/test/tRTDBPort.cc                |   2 +-
 MAC/GCF/RTDB/test/tRTDBPort.h                 |   2 +-
 MAC/GCF/RTDB/test/testQuery.cc                |   2 +-
 MAC/GCF/RTDB/test/testQuery.h                 |   2 +-
 MAC/GCF/TM/include/GCF/TM/GCF_Control.h       |   2 +-
 MAC/GCF/TM/include/GCF/TM/GCF_DevicePort.h    |   2 +-
 MAC/GCF/TM/include/GCF/TM/GCF_ETHRawPort.h    |   2 +-
 MAC/GCF/TM/include/GCF/TM/GCF_Fsm.h           |   2 +-
 MAC/GCF/TM/include/GCF/TM/GCF_Handler.h       |   2 +-
 MAC/GCF/TM/include/GCF/TM/GCF_ITCPort.h       |   2 +-
 MAC/GCF/TM/include/GCF/TM/GCF_Port.h          |   2 +-
 MAC/GCF/TM/include/GCF/TM/GCF_PortInterface.h |   2 +-
 MAC/GCF/TM/include/GCF/TM/GCF_Protocols.h     |   2 +-
 MAC/GCF/TM/include/GCF/TM/GCF_RawPort.h       |   2 +-
 MAC/GCF/TM/include/GCF/TM/GCF_Scheduler.h     |   2 +-
 MAC/GCF/TM/include/GCF/TM/GCF_TCPPort.h       |   2 +-
 MAC/GCF/TM/include/GCF/TM/GCF_Task.h          |   2 +-
 MAC/GCF/TM/include/GCF/TM/GCF_TimerPort.h     |   2 +-
 MAC/GCF/TM/include/GCF/TM/TestTask.h          |   2 +-
 MAC/GCF/TM/src/GCF_Fsm.cc                     |   2 +-
 MAC/GCF/TM/src/GCF_Handler.cc                 |   2 +-
 MAC/GCF/TM/src/GCF_Protocols.cc               |   2 +-
 MAC/GCF/TM/src/GCF_Scheduler.cc               |   2 +-
 MAC/GCF/TM/src/GTM_Defines.h                  |   2 +-
 MAC/GCF/TM/src/Port/GCF_Port.cc               |   2 +-
 MAC/GCF/TM/src/Port/GCF_PortInterface.cc      |   2 +-
 MAC/GCF/TM/src/Port/GCF_RawPort.cc            |   2 +-
 MAC/GCF/TM/src/PortImpl/GCF_DevicePort.cc     |   2 +-
 MAC/GCF/TM/src/PortImpl/GCF_ETHRawPort.cc     |   2 +-
 MAC/GCF/TM/src/PortImpl/GCF_ITCPort.cc        |   2 +-
 MAC/GCF/TM/src/PortImpl/GCF_TCPPort.cc        |   2 +-
 MAC/GCF/TM/src/PortImpl/GTM_Device.cc         |   2 +-
 MAC/GCF/TM/src/PortImpl/GTM_Device.h          |   2 +-
 MAC/GCF/TM/src/PortImpl/GTM_ETHSocket.cc      |   2 +-
 MAC/GCF/TM/src/PortImpl/GTM_ETHSocket.h       |   2 +-
 MAC/GCF/TM/src/PortImpl/GTM_File.cc           |   2 +-
 MAC/GCF/TM/src/PortImpl/GTM_File.h            |   2 +-
 MAC/GCF/TM/src/PortImpl/GTM_FileHandler.cc    |   2 +-
 MAC/GCF/TM/src/PortImpl/GTM_FileHandler.h     |   2 +-
 .../TM/src/PortImpl/GTM_TCPServerSocket.cc    |   2 +-
 MAC/GCF/TM/src/PortImpl/GTM_TCPServerSocket.h |   2 +-
 MAC/GCF/TM/src/PortImpl/GTM_TCPSocket.cc      |   2 +-
 MAC/GCF/TM/src/PortImpl/GTM_TCPSocket.h       |   2 +-
 MAC/GCF/TM/src/ServiceBroker/GTM_SBTCPPort.cc |   2 +-
 MAC/GCF/TM/src/ServiceBroker/GTM_SBTCPPort.h  |   2 +-
 .../TM/src/ServiceBroker/ServiceBrokerTask.cc |   2 +-
 .../TM/src/ServiceBroker/ServiceBrokerTask.h  |   2 +-
 .../TM/src/TestFramework/TestFW_Protocol.prot |   2 +-
 MAC/GCF/TM/src/TestFramework/TestTask.cc      |   2 +-
 MAC/GCF/TM/src/Timer/GTM_Timer.cc             |   2 +-
 MAC/GCF/TM/src/Timer/GTM_Timer.h              |   2 +-
 MAC/GCF/TM/src/Timer/GTM_TimerHandler.cc      |   2 +-
 MAC/GCF/TM/src/Timer/GTM_TimerHandler.h       |   2 +-
 MAC/GCF/TM/test/Echo.cc                       |   2 +-
 MAC/GCF/TM/test/Echo.h                        |   2 +-
 MAC/GCF/TM/test/Ping.cc                       |   2 +-
 MAC/GCF/TM/test/Ping.h                        |   2 +-
 MAC/GCF/TM/test/PythonTest_Protocol.prot      |   2 +-
 MAC/GCF/TM/test/tAutoOpen.cc                  |   2 +-
 MAC/GCF/TM/test/tAutoOpen.h                   |   2 +-
 MAC/GCF/TM/test/tClient.cc                    |   2 +-
 MAC/GCF/TM/test/tClient.h                     |   2 +-
 MAC/GCF/TM/test/tEventBinding.cc              |   2 +-
 MAC/GCF/TM/test/tEventBinding.h               |   2 +-
 MAC/GCF/TM/test/tEventQueue.cc                |   2 +-
 MAC/GCF/TM/test/tEventQueue.h                 |   2 +-
 MAC/GCF/TM/test/tGCFPort.cc                   |   2 +-
 MAC/GCF/TM/test/tGCFPort.h                    |   2 +-
 MAC/GCF/TM/test/tGCFTask1.cc                  |   2 +-
 MAC/GCF/TM/test/tGCFTask2.cc                  |   2 +-
 MAC/GCF/TM/test/tGCFTask3.cc                  |   2 +-
 MAC/GCF/TM/test/tGCFTask4.cc                  |   2 +-
 MAC/GCF/TM/test/tGCFTask5.cc                  |   2 +-
 MAC/GCF/TM/test/tITCPort.cc                   |   2 +-
 MAC/GCF/TM/test/tITCPort.h                    |   2 +-
 MAC/GCF/TM/test/tPythonClient.cc              |   2 +-
 MAC/GCF/TM/test/tPythonClient.h               |   2 +-
 MAC/GCF/TM/test/tPythonServer.cc              |   2 +-
 MAC/GCF/TM/test/tPythonServer.h               |   2 +-
 MAC/GCF/TM/test/tServer.cc                    |   2 +-
 MAC/GCF/TM/test/tServer.h                     |   2 +-
 MAC/GCF/TM/test/tStateResult.cc               |   2 +-
 MAC/GCF/TM/test/tStateResult.h                |   2 +-
 MAC/GCF/TM/test/tTimer.cc                     |   2 +-
 MAC/GCF/TM/test/tTimer.h                      |   2 +-
 MAC/GCF/TM/test/testTask.cc                   |   2 +-
 MAC/GCF/TM/test/testTask.h                    |   2 +-
 .../_PAL/PA/pvss/scripts/libs/gcf-logging.ctl |   2 +-
 .../_PAL/PA/pvss/scripts/libs/gcfpa-com.ctl   |   2 +-
 .../_PAL/PA/pvss/scripts/libs/gcfpa-cwd.ctl   |   2 +-
 .../_PAL/PA/pvss/scripts/libs/gcfpa-pml.ctl   |   2 +-
 MAC/GCF/_PAL/PA/src/GPA_Controller.cc         |   2 +-
 MAC/GCF/_PAL/PA/src/GPA_Controller.h          |   2 +-
 MAC/GCF/_PAL/PA/src/GPA_Defines.h             |   2 +-
 MAC/GCF/_PAL/PA/src/GPA_Main.cc               |   2 +-
 MAC/GCF/_PAL/PA/src/GPA_PropSetSession.cc     |   2 +-
 MAC/GCF/_PAL/PA/src/GPA_PropSetSession.h      |   2 +-
 MAC/GCF/_PAL/PA/src/GPA_PropertySet.cc        |   2 +-
 MAC/GCF/_PAL/PA/src/GPA_PropertySet.h         |   2 +-
 MAC/GCF/_PAL/PA/src/GPA_RequestManager.cc     |   2 +-
 MAC/GCF/_PAL/PA/src/GPA_RequestManager.h      |   2 +-
 MAC/GCF/_PAL/PI/src/GPI_CEPServer.cc          |   2 +-
 MAC/GCF/_PAL/PI/src/GPI_CEPServer.h           |   2 +-
 MAC/GCF/_PAL/PI/src/GPI_Controller.cc         |   2 +-
 MAC/GCF/_PAL/PI/src/GPI_Controller.h          |   2 +-
 MAC/GCF/_PAL/PI/src/GPI_Defines.h             |   2 +-
 MAC/GCF/_PAL/PI/src/GPI_Main.cc               |   2 +-
 MAC/GCF/_PAL/PI/src/GPI_PMLlightServer.cc     |   2 +-
 MAC/GCF/_PAL/PI/src/GPI_PMLlightServer.h      |   2 +-
 MAC/GCF/_PAL/PI/src/GPI_PropertyProxy.cc      |   2 +-
 MAC/GCF/_PAL/PI/src/GPI_PropertyProxy.h       |   2 +-
 MAC/GCF/_PAL/PI/src/GPI_PropertySet.cc        |   2 +-
 MAC/GCF/_PAL/PI/src/GPI_PropertySet.h         |   2 +-
 MAC/GCF/_PAL/PI/src/GPI_RTCServer.cc          |   2 +-
 MAC/GCF/_PAL/PI/src/GPI_RTCServer.h           |   2 +-
 MAC/GCF/_PAL/PI/src/GPI_TH_Port.cc            |   2 +-
 MAC/GCF/_PAL/PI/src/GPI_TH_Port.h             |   2 +-
 MAC/GCF/_PAL/PML/src/GCF_Answer.cc            |   2 +-
 MAC/GCF/_PAL/PML/src/GCF_ExtProperty.cc       |   2 +-
 MAC/GCF/_PAL/PML/src/GCF_ExtPropertySet.cc    |   2 +-
 MAC/GCF/_PAL/PML/src/GCF_MyProperty.cc        |   2 +-
 MAC/GCF/_PAL/PML/src/GCF_MyPropertySet.cc     |   2 +-
 MAC/GCF/_PAL/PML/src/GCF_Property.cc          |   2 +-
 MAC/GCF/_PAL/PML/src/GCF_PropertyProxy.cc     |   2 +-
 MAC/GCF/_PAL/PML/src/GCF_PropertySet.cc       |   2 +-
 MAC/GCF/_PAL/PML/src/GCF_PropertySetAnswer.cc |   2 +-
 MAC/GCF/_PAL/PML/src/GPM_Controller.cc        |   2 +-
 MAC/GCF/_PAL/PML/src/GPM_Controller.h         |   2 +-
 MAC/GCF/_PAL/PML/src/GPM_Defines.h            |   2 +-
 MAC/GCF/_PAL/PML/src/GPM_PropertyProxy.h      |   2 +-
 MAC/GCF/_PAL/PML/src/GPM_PropertyService.cc   |   2 +-
 MAC/GCF/_PAL/PML/src/GPM_PropertyService.h    |   2 +-
 MAC/GCF/_PAL/PML/test/GSA_Defines.h           |   2 +-
 MAC/GCF/_PAL/PML/test/GSA_Service.h           |   2 +-
 MAC/GCF/_PAL/PML/test/PerformanceService.h    |   2 +-
 MAC/GCF/_PAL/PML/test/tPAPerformance.cc       |   2 +-
 MAC/GCF/_PAL/PML/test/tPAPerformance.h        |   2 +-
 MAC/GCF/_PAL/SAL/src/GCF_PVSSInfo.cc          |   2 +-
 MAC/GCF/_PAL/SAL/src/GCF_PVSSPort.cc          |   2 +-
 MAC/GCF/_PAL/SAL/src/GCF_SysConnGuard.cc      |   2 +-
 MAC/GCF/_PAL/SAL/src/GSA_Defines.h            |   2 +-
 MAC/GCF/_PAL/SAL/src/GSA_PortService.cc       |   2 +-
 MAC/GCF/_PAL/SAL/src/GSA_PortService.h        |   2 +-
 MAC/GCF/_PAL/SAL/src/GSA_PvssApi.cc           |   2 +-
 MAC/GCF/_PAL/SAL/src/GSA_PvssApi.h            |   2 +-
 MAC/GCF/_PAL/SAL/src/GSA_Resources.cc         |   2 +-
 MAC/GCF/_PAL/SAL/src/GSA_Resources.h          |   2 +-
 MAC/GCF/_PAL/SAL/src/GSA_SCADAHandler.cc      |   2 +-
 MAC/GCF/_PAL/SAL/src/GSA_SCADAHandler.h       |   2 +-
 MAC/GCF/_PAL/SAL/src/GSA_Service.cc           |   2 +-
 MAC/GCF/_PAL/SAL/src/GSA_Service.h            |   2 +-
 MAC/GCF/_PAL/SAL/src/GSA_SysConnGuard.cc      |   2 +-
 MAC/GCF/_PAL/SAL/src/GSA_SysConnGuard.h       |   2 +-
 MAC/GCF/_PAL/SAL/src/GSA_WaitForAnswer.cc     |   2 +-
 MAC/GCF/_PAL/SAL/src/GSA_WaitForAnswer.h      |   2 +-
 MAC/GCF/_PAL/SAL/test/Echo.cc                 |   2 +-
 MAC/GCF/_PAL/SAL/test/Echo.h                  |   2 +-
 MAC/GCF/_PAL/SAL/test/PerformanceService.h    |   2 +-
 MAC/GCF/_PAL/SAL/test/Ping.cc                 |   2 +-
 MAC/GCF/_PAL/SAL/test/Ping.h                  |   2 +-
 MAC/GCF/_PAL/SAL/test/Service.h               |   2 +-
 MAC/GCF/_PAL/SAL/test/tGSAPerformance.cc      |   2 +-
 MAC/GCF/_PAL/SAL/test/tGSAPerformance.h       |   2 +-
 MAC/GCF/_PAL/SAL/test/tGSAService.cc          |   2 +-
 MAC/GCF/_PAL/SAL/test/tGSAService.h           |   2 +-
 MAC/GCF/_PAL/include/GCF/PAL/GCF_Answer.h     |   2 +-
 .../_PAL/include/GCF/PAL/GCF_ExtProperty.h    |   2 +-
 .../_PAL/include/GCF/PAL/GCF_ExtPropertySet.h |   2 +-
 MAC/GCF/_PAL/include/GCF/PAL/GCF_MyProperty.h |   2 +-
 .../_PAL/include/GCF/PAL/GCF_MyPropertySet.h  |   2 +-
 MAC/GCF/_PAL/include/GCF/PAL/GCF_PVSSInfo.h   |   2 +-
 MAC/GCF/_PAL/include/GCF/PAL/GCF_PVSSPort.h   |   2 +-
 MAC/GCF/_PAL/include/GCF/PAL/GCF_Property.h   |   2 +-
 .../_PAL/include/GCF/PAL/GCF_PropertyProxy.h  |   2 +-
 .../_PAL/include/GCF/PAL/GCF_PropertySet.h    |   2 +-
 .../include/GCF/PAL/GCF_PropertySetAnswer.h   |   2 +-
 .../GCF_PropertySetAnswerHandlerInterface.h   |   2 +-
 .../_PAL/include/GCF/PAL/GCF_SysConnGuard.h   |   2 +-
 .../_PALlight/CEP-PMLlight/src/CEPProperty.cc |   2 +-
 .../CEP-PMLlight/src/CEPPropertySet.cc        |   2 +-
 .../_PALlight/CEP-PMLlight/src/PICEPDefines.h |   2 +-
 .../_PALlight/CEP-PMLlight/src/PIClient.cc    |   2 +-
 MAC/GCF/_PALlight/CEP-PMLlight/src/PIClient.h |   2 +-
 .../_PALlight/PMLlight/src/GCF_RTAnswer.cc    |   2 +-
 .../PMLlight/src/GCF_RTMyProperty.cc          |   2 +-
 .../PMLlight/src/GCF_RTMyPropertySet.cc       |   2 +-
 .../PMLlight/src/GPM_RTController.cc          |   2 +-
 .../_PALlight/PMLlight/src/GPM_RTController.h |   2 +-
 .../_PALlight/PMLlight/src/GPM_RTDefines.h    |   2 +-
 .../include/GCF/PALlight/CEPProperty.h        |   2 +-
 .../include/GCF/PALlight/CEPPropertySet.h     |   2 +-
 .../include/GCF/PALlight/GCF_RTAnswer.h       |   2 +-
 .../include/GCF/PALlight/GCF_RTMyProperty.h   |   2 +-
 .../GCF/PALlight/GCF_RTMyPropertySet.h        |   2 +-
 MAC/MACIO/autogen/MACIO.py                    |   2 +-
 MAC/MACIO/autogen/protocol.tpl                |   2 +-
 MAC/MACIO/autogen/pytocol.tpl                 |   2 +-
 MAC/MACIO/include/MACIO/DoubleVector.h        |   2 +-
 MAC/MACIO/include/MACIO/EventPort.h           |   2 +-
 MAC/MACIO/include/MACIO/GCF_Event.h           |   2 +-
 MAC/MACIO/include/MACIO/KVTLogger.h           |   2 +-
 MAC/MACIO/include/MACIO/MACServiceInfo.h      |   2 +-
 MAC/MACIO/include/MACIO/Marshalling.tcc       |   2 +-
 MAC/MACIO/include/MACIO/ProtocolDefs.h        |   2 +-
 MAC/MACIO/include/MACIO/RTmetadata.h          |   2 +-
 MAC/MACIO/include/MACIO/StringVector.h        |   2 +-
 MAC/MACIO/src/EventPort.cc                    |   2 +-
 MAC/MACIO/src/GCF_Event.cc                    |   2 +-
 MAC/MACIO/src/KVTLogger.cc                    |   2 +-
 MAC/MACIO/src/KVT_Protocol.prot               |   2 +-
 MAC/MACIO/src/LOG_Protocol.prot               |   2 +-
 MAC/MACIO/src/ProtocolDefs.cc                 |   2 +-
 MAC/MACIO/src/RTmetadata.cc                   |   2 +-
 MAC/MACIO/src/SB_Protocol.prot                |   2 +-
 MAC/MACIO/test/tClone.cc                      |   2 +-
 MAC/MACIO/test/tEventPort.cc                  |   2 +-
 MAC/MACIO/test/tKVTLogger.cc                  |   2 +-
 MAC/MACIO/test/tMarshalling.cc                |   2 +-
 MAC/MACIO/test/tMarshalling.h                 |   2 +-
 MAC/MACIO/test/tProtocol.cc                   |   2 +-
 MAC/MACIO/test/tRTmetadata.cc                 |   2 +-
 MAC/MACIO/test/testprotocol.prot              |   2 +-
 MAC/Navigator2/scripts/gcf_cwd.ctl            |   2 +-
 MAC/Navigator2/scripts/libs/CEP_Processes.ctl |   2 +-
 MAC/Navigator2/scripts/libs/GCFAlarm.ctl      |   2 +-
 MAC/Navigator2/scripts/libs/GCFCWD.ctl        |   2 +-
 MAC/Navigator2/scripts/libs/GCFCommon.ctl     |   2 +-
 .../scripts/libs/GCFCommon_prod.ctl           |   2 +-
 .../scripts/libs/GCFCommon_test.ctl           |   2 +-
 MAC/Navigator2/scripts/libs/GCFLogging.ctl    |   2 +-
 .../scripts/libs/MainCU_Processes.ctl         |   2 +-
 .../scripts/libs/Station_Processes.ctl        |   2 +-
 MAC/Navigator2/scripts/libs/claimManager.ctl  |   2 +-
 MAC/Navigator2/scripts/libs/navConfig.ctl     |   2 +-
 MAC/Navigator2/scripts/libs/navCtrl.ctl       |   2 +-
 MAC/Navigator2/scripts/libs/navFunct.ctl      |   2 +-
 MAC/Navigator2/scripts/libs/navPanel.ctl      |   2 +-
 .../scripts/libs/navProgressCtrl.ctl          |   2 +-
 MAC/Navigator2/scripts/libs/navTabCtrl.ctl    |   2 +-
 MAC/Navigator2/scripts/libs/navigator.ctl     |   2 +-
 MAC/Navigator2/scripts/monitorAlarms.ctl      |   2 +-
 .../scripts/monitorStateChanges.ctl           |   2 +-
 MAC/Navigator2/scripts/monitorStateReset.ctl  |   2 +-
 .../scripts/monitorStationAlarms.ctl          |   2 +-
 MAC/Navigator2/scripts/readStationConfigs.ctl |   2 +-
 .../scripts/readStationConnections.ctl        |   2 +-
 MAC/Test/GCF/CEP/src/CEPEcho.cc               |   2 +-
 MAC/Test/GCF/CEP/src/CEPPing.cc               |   2 +-
 MAC/Test/GCF/CEP/src/DH_EchoPing.cc           |   2 +-
 MAC/Test/GCF/CEP/src/DH_EchoPing.h            |   2 +-
 MAC/Test/GCF/MAC/src/PropertyProxy.cc         |   2 +-
 MAC/Test/GCF/MAC/src/PropertyProxy.h          |   2 +-
 MAC/Test/GCF/RTC/src/RTEcho.cc                |   2 +-
 MAC/Test/GCF/RTC/src/RTEcho.h                 |   2 +-
 MAC/Test/GCF/RTC/src/RTPing.cc                |   2 +-
 MAC/Test/GCF/RTC/src/RTPing.h                 |   2 +-
 MAC/Test/PROTO/Event/GCF/GCF_Event.h          |   2 +-
 MAC/Test/PROTO/Event/GCF/GCF_TMProtocols.h    |   2 +-
 MAC/Test/PROTO/Event/GCF_Event.cc             |   2 +-
 MAC/Test/PROTO/Event/protocol.tpl             |   2 +-
 MAC/Test/PROTO/Event/protocol.tpl.ph-only     |   2 +-
 MAC/Test/PROTO/EventExt/GCF/GCF_Event.h       |   2 +-
 MAC/Test/PROTO/EventExt/GCF/GCF_TMProtocols.h |   2 +-
 MAC/Test/PROTO/EventExt/protocol.tpl          |   2 +-
 MAC/Test/PROTO/EventExt/pybind.ph             |   2 +-
 MAC/Test/PROTO/PI/autogen/protocol.tpl        |   2 +-
 MAC/Test/PROTO/PROP/src/FPBoolValue.cc        |   2 +-
 MAC/Test/PROTO/PROP/src/FPBoolValue.h         |   2 +-
 MAC/Test/PROTO/PROP/src/FPByteValue.cc        |   2 +-
 MAC/Test/PROTO/PROP/src/FPByteValue.h         |   2 +-
 MAC/Test/PROTO/PROP/src/FPDWordValue.cc       |   2 +-
 MAC/Test/PROTO/PROP/src/FPDWordValue.h        |   2 +-
 MAC/Test/PROTO/PROP/src/FPDoubleValue.cc      |   2 +-
 MAC/Test/PROTO/PROP/src/FPDoubleValue.h       |   2 +-
 MAC/Test/PROTO/PROP/src/FPFloatValue.cc       |   2 +-
 MAC/Test/PROTO/PROP/src/FPFloatValue.h        |   2 +-
 MAC/Test/PROTO/PROP/src/FPLongLongValue.cc    |   2 +-
 MAC/Test/PROTO/PROP/src/FPLongLongValue.h     |   2 +-
 MAC/Test/PROTO/PROP/src/FPValue.cc            |   2 +-
 MAC/Test/PROTO/PROP/src/FPValue.h             |   2 +-
 MAC/Test/PROTO/PROP/src/FPWordValue.cc        |   2 +-
 MAC/Test/PROTO/PROP/src/FPWordValue.h         |   2 +-
 MAC/Test/PROTO/PROP/src/FProperty.cc          |   2 +-
 MAC/Test/PROTO/PROP/src/FProperty.h           |   2 +-
 MAC/Test/PROTO/TASK/src/GCF_Defines.hxx       |   2 +-
 MAC/Test/PROTO/TASK/src/GCF_Event.hxx         |   2 +-
 MAC/Test/PROTO/TASK/src/GCF_Fsm.cxx           |   2 +-
 MAC/Test/PROTO/TASK/src/GCF_Fsm.hxx           |   2 +-
 MAC/Test/PROTO/TASK/src/GCF_PortInterface.hxx |   2 +-
 MAC/Test/PROTO/TASK/src/GCF_Protocols.cxx     |   2 +-
 MAC/Test/PROTO/TASK/src/GCF_Protocols.hxx     |   2 +-
 MAC/Test/PROTO/TASK/src/GCF_Task.cxx          |   2 +-
 MAC/Test/PROTO/TASK/src/GCF_Task.hxx          |   2 +-
 MAC/Test/TestHarness/THEcho/src/THEcho.cc     |   2 +-
 MAC/Test/TestHarness/THEcho/src/THEcho.h      |   2 +-
 .../TestHarness/THEcho/test/THEchoTest.cc     |   2 +-
 MAC/Test/TestHarness/THEcho/test/THEchoTest.h |   2 +-
 .../THPVSSBridge/src/PropertyProxy.cc         |   2 +-
 .../THPVSSBridge/src/PropertyProxy.h          |   2 +-
 .../THPVSSBridge/src/THPVSSBridge.cc          |   2 +-
 .../THPVSSBridge/src/THPVSSBridge.h           |   2 +-
 .../THPVSSBridge/src/THPVSSBridgeMain.cc      |   2 +-
 .../TestHarness/TSE/scripts/MACall.tse.prot   |   2 +-
 .../protconverter/TSE-protocol.tpl            |   2 +-
 .../TestHarness/protconverter/protconvert.c   |   2 +-
 RTCP/Cobalt/CoInterface/src/BudgetTimer.cc    |   2 +-
 RTCP/Cobalt/CoInterface/src/BudgetTimer.h     |   2 +-
 RTCP/Cobalt/CoInterface/src/Queue.h           |   2 +-
 .../OTB/src/nl/astron/lofar/sas/otb/Main.java |   2 +-
 .../nl/astron/lofar/sas/otb/MainFrame.java    |   2 +-
 .../nl/astron/lofar/sas/otb/SharedVars.java   |   2 +-
 .../exceptions/ConnectionFailedException.java |   2 +-
 .../sas/otb/exceptions/NoAccessException.java |   2 +-
 .../otb/exceptions/NoDatabaseException.java   |   2 +-
 .../NoServerConnectionException.java          |   2 +-
 .../otb/exceptions/NotLoggedInException.java  |   2 +-
 .../ParmDBConfigurationException.java         |   2 +-
 .../otb/panels/ComponentMaintenancePanel.java |   2 +-
 .../lofar/sas/otb/panels/IPluginPanel.java    |   2 +-
 .../lofar/sas/otb/panels/MainPanel.java       |   2 +-
 .../sas/otb/panels/ResultBrowserPanel.java    |   2 +-
 .../lofar/sas/otb/panels/SamplePanel.java     |   2 +-
 .../otb/panels/TemplateMaintenancePanel.java  |   2 +-
 .../lofar/sas/otb/util/AccessRights.java      |   2 +-
 .../nl/astron/lofar/sas/otb/util/CmdExec.java |   2 +-
 .../lofar/sas/otb/util/ConfigPanelHelper.java |   2 +-
 .../astron/lofar/sas/otb/util/IViewPanel.java |   2 +-
 .../nl/astron/lofar/sas/otb/util/OtdbRmi.java |   2 +-
 .../otb/util/ParmDBConfigurationHelper.java   |   2 +-
 .../lofar/sas/otb/util/ResultPanelHelper.java |   2 +-
 .../otb/util/SerializableFileContents.java    |   2 +-
 .../lofar/sas/otb/util/StorageLocation.java   |   2 +-
 .../lofar/sas/otb/util/UserAccount.java       |   2 +-
 .../lofar/sas/otb/util/jParmDBnode.java       |   2 +-
 .../plotter/PlotDataAccessParmDBImpl.java     |   2 +-
 .../lofar/sas/otb/util/plotter/PlotGroup.java |   2 +-
 .../util/plotter/PlotGroupConfiguration.java  |   2 +-
 .../otb/util/plotter/PlotGroupManager.java    |   2 +-
 .../lofar/sas/otb/util/plotter/PlotSlot.java  |   2 +-
 .../otb/util/plotter/PlotSlotListener.java    |   2 +-
 .../sas/otb/util/plotter/PlotSlotManager.java |   2 +-
 .../otb/util/plotter/PlotSlotViewFrame.java   |   2 +-
 .../sas/otb/util/plotter/PlotSlotsPanel.java  |   2 +-
 .../AnaBeamConfigurationTableModel.java       |   2 +-
 .../BeamConfigurationTableModel.java          |   2 +-
 .../BeamformerConfigurationTableModel.java    |   2 +-
 .../util/tablemodels/ComponentTableModel.java |   2 +-
 .../DefaultTemplatetableModel.java            |   2 +-
 .../tablemodels/InputNodeMACTableModel.java   |   2 +-
 .../util/tablemodels/LogParamTableModel.java  |   2 +-
 .../util/tablemodels/MetadataTableModel.java  |   2 +-
 .../otb/util/tablemodels/PICtableModel.java   |   2 +-
 .../tablemodels/ParamExtensionTableModel.java |   2 +-
 .../PencilConfigurationTableModel.java        |   2 +-
 .../util/tablemodels/RSPMACTableModel.java    |   2 +-
 .../StateChangeHistoryTableModel.java         |   2 +-
 .../StationPositionsTableModel.java           |   2 +-
 .../tablemodels/SubbandFreqTableModel.java    |   2 +-
 .../TBBConfigurationTableModel.java           |   2 +-
 .../util/tablemodels/TemplatetableModel.java  |   2 +-
 .../TiedArrayBeamConfigurationTableModel.java |   2 +-
 .../util/treemanagers/GenericTreeManager.java |   2 +-
 .../otb/util/treemanagers/ITreeManager.java   |   2 +-
 .../treemanagers/OTDBParamTreeManager.java    |   2 +-
 .../util/treemanagers/ParmDBTreeManager.java  |   2 +-
 .../util/treemanagers/ResultTreeManager.java  |   2 +-
 .../treemanagers/TemplateTreeManager.java     |   2 +-
 .../sas/otb/util/treenodes/TreeNode.java      |   2 +-
 .../sas/otbcomponents/AnaBeamDialog.java      |   2 +-
 .../lofar/sas/otbcomponents/BeamDialog.java   |   2 +-
 .../sas/otbcomponents/BeamFileDialog.java     |   2 +-
 .../lofar/sas/otbcomponents/ButtonPanel.java  |   2 +-
 .../sas/otbcomponents/CampaignInfoDialog.java |   2 +-
 .../sas/otbcomponents/ComponentPanel.java     |   2 +-
 .../otbcomponents/CoordConversionDialog.java  |   2 +-
 .../CreateDefaultTemplateDialog.java          |   2 +-
 .../lofar/sas/otbcomponents/ListDialog.java   |   2 +-
 .../lofar/sas/otbcomponents/ListPanel.java    |   2 +-
 .../sas/otbcomponents/LoadFileDialog.java     |   2 +-
 .../sas/otbcomponents/LogParamPanel.java      |   2 +-
 .../lofar/sas/otbcomponents/LoginDialog.java  |   2 +-
 .../sas/otbcomponents/MetadataDialog.java     |   2 +-
 .../sas/otbcomponents/MultiEditDialog.java    |   2 +-
 .../sas/otbcomponents/NodeViewPanel.java      |   2 +-
 .../otbcomponents/ParSetMetaViewPanel.java    |   2 +-
 .../sas/otbcomponents/ParSetViewPanel.java    |   2 +-
 .../otbcomponents/ParamExtensionDialog.java   |   2 +-
 .../sas/otbcomponents/ParameterViewPanel.java |   2 +-
 .../sas/otbcomponents/ParmDBConfigPanel.java  |   2 +-
 .../sas/otbcomponents/ParmDBPlotPanel.java    |   2 +-
 .../lofar/sas/otbcomponents/PencilDialog.java |   2 +-
 .../sas/otbcomponents/SetServerDialog.java    |   2 +-
 .../otbcomponents/StationSelectionPanel.java  |   2 +-
 .../lofar/sas/otbcomponents/StatusPanel.java  |   2 +-
 .../otbcomponents/StorageSelectionPanel.java  |   2 +-
 .../lofar/sas/otbcomponents/TableDialog.java  |   2 +-
 .../otbcomponents/TiedArrayBeamDialog.java    |   2 +-
 .../sas/otbcomponents/TreeInfoDialog.java     |   2 +-
 .../lofar/sas/otbcomponents/TreePanel.java    |   2 +-
 .../otbcomponents/VICnodeDefViewPanel.java    |   2 +-
 .../otbcomponents/VerticalButtonPanel.java    |   2 +-
 .../lofar/sas/otbcomponents/bbs/BBSPanel.java |   2 +-
 .../otbcomponents/bbs/BBSStrategyPanel.java   |   2 +-
 .../bbs/stepmanagement/BBSStep.java           |   2 +-
 .../bbs/stepmanagement/BBSStepData.java       |   2 +-
 .../stepmanagement/BBSStepDataManager.java    |   2 +-
 .../stepmanagement/BBSStepExplorerPanel.java  |   2 +-
 .../stepmanagement/BBSStepInputDialog.java    |   2 +-
 .../bbs/stepmanagement/BBSStepNode.java       |   2 +-
 .../stepmanagement/BBSStepTreeManager.java    |   2 +-
 .../bbs/stepmanagement/BBSStrategy.java       |   2 +-
 .../BBSStepOperationPanelSolveImpl.java       |   2 +-
 .../operations/IBBSStepOperationPanel.java    |   2 +-
 .../otbcomponents/userpanels/CobaltPanel.java |   2 +-
 .../otbcomponents/userpanels/ImagerPanel.java |   2 +-
 .../userpanels/ObservationPanel.java          |   2 +-
 .../userpanels/TBBConfigPanel.java            |   2 +-
 .../lofar/java/sas/otb/rsp/ControlPanel.java  |   2 +-
 .../lofar/java/sas/otb/rsp/ITabPanel.java     |   2 +-
 .../lofar/java/sas/otb/rsp/ListPanel.java     |   2 +-
 .../lofar/java/sas/otb/rsp/MainPanel.java     |   2 +-
 .../java/sas/otb/rsp/MaskSelectionPanel.java  |   2 +-
 .../lofar/java/sas/otb/rsp/PlotContainer.java |   2 +-
 .../lofar/java/sas/otb/rsp/PlotDataModel.java |   2 +-
 .../rsp/beamletstats/BeamletStatsPanel.java   |   2 +-
 .../sas/otb/rsp/control/RSPControlPanel.java  |   2 +-
 .../sas/otb/rsp/status/ADOStatusPanel.java    |   2 +-
 .../sas/otb/rsp/status/DIAGStatusPanel.java   |   2 +-
 .../sas/otb/rsp/status/ETHStatusPanel.java    |   2 +-
 .../sas/otb/rsp/status/MEPStatusPanel.java    |   2 +-
 .../sas/otb/rsp/status/RCUStatusPanel.java    |   2 +-
 .../sas/otb/rsp/status/RSPStatusPanel.java    |   2 +-
 .../sas/otb/rsp/status/RSUStatusPanel.java    |   2 +-
 .../java/sas/otb/rsp/status/StatusPanel.java  |   2 +-
 .../sas/otb/rsp/status/SyncStatusPanel.java   |   2 +-
 .../rsp/subbandstats/SubbandStatsPanel.java   |   2 +-
 .../subbandstats/SubbandStatsPlotPanel.java   |   2 +-
 .../WaveformSettingsInputPanel.java           |   2 +-
 .../WaveformSettingsListPanel.java            |   2 +-
 .../subbandstats/WaveformSettingsPanel.java   |   2 +-
 .../rsp/subbandstats/WaveformTableModel.java  |   2 +-
 .../nl_astron_lofar_sas_otb_jotdb3_jCommon.h  |   2 +-
 .../lofar/sas/otb/jotdb3/jCampaign.java       |   2 +-
 .../lofar/sas/otb/jotdb3/jCampaignInfo.java   |   2 +-
 .../sas/otb/jotdb3/jCampaignInterface.java    |   2 +-
 .../lofar/sas/otb/jotdb3/jClassifConv.java    |   2 +-
 .../sas/otb/jotdb3/jConverterInterface.java   |   2 +-
 .../sas/otb/jotdb3/jDefaultTemplate.java      |   2 +-
 .../lofar/sas/otb/jotdb3/jInitCPPLogger.java  |   2 +-
 .../lofar/sas/otb/jotdb3/jOTDBaccess.java     |   2 +-
 .../lofar/sas/otb/jotdb3/jOTDBconnection.java |   2 +-
 .../lofar/sas/otb/jotdb3/jOTDBinterface.java  |   2 +-
 .../lofar/sas/otb/jotdb3/jOTDBnode.java       |   2 +-
 .../lofar/sas/otb/jotdb3/jOTDBparam.java      |   2 +-
 .../lofar/sas/otb/jotdb3/jOTDBserver.java     |   2 +-
 .../lofar/sas/otb/jotdb3/jOTDBtree.java       |   2 +-
 .../lofar/sas/otb/jotdb3/jOTDBvalue.java      |   2 +-
 .../lofar/sas/otb/jotdb3/jParamTypeConv.java  |   2 +-
 .../sas/otb/jotdb3/jTreeMaintenance.java      |   2 +-
 .../otb/jotdb3/jTreeMaintenanceInterface.java |   2 +-
 .../lofar/sas/otb/jotdb3/jTreeState.java      |   2 +-
 .../lofar/sas/otb/jotdb3/jTreeStateConv.java  |   2 +-
 .../lofar/sas/otb/jotdb3/jTreeTypeConv.java   |   2 +-
 .../lofar/sas/otb/jotdb3/jTreeValue.java      |   2 +-
 .../sas/otb/jotdb3/jTreeValueInterface.java   |   2 +-
 .../lofar/sas/otb/jotdb3/jUnitConv.java       |   2 +-
 .../lofar/sas/otb/jotdb3/jVICnodeDef.java     |   2 +-
 ...l_astron_lofar_sas_otb_jotdb3_jCampaign.cc |   2 +-
 ...stron_lofar_sas_otb_jotdb3_jClassifConv.cc |   2 +-
 .../nl_astron_lofar_sas_otb_jotdb3_jCommon.cc |   2 +-
 ...ron_lofar_sas_otb_jotdb3_jInitCPPLogger.cc |   2 +-
 ...on_lofar_sas_otb_jotdb3_jOTDBconnection.cc |   2 +-
 ...ron_lofar_sas_otb_jotdb3_jParamTypeConv.cc |   2 +-
 ...n_lofar_sas_otb_jotdb3_jTreeMaintenance.cc |   2 +-
 ...ron_lofar_sas_otb_jotdb3_jTreeStateConv.cc |   2 +-
 ...tron_lofar_sas_otb_jotdb3_jTreeTypeConv.cc |   2 +-
 ..._astron_lofar_sas_otb_jotdb3_jTreeValue.cc |   2 +-
 ...l_astron_lofar_sas_otb_jotdb3_jUnitConv.cc |   2 +-
 .../conf/Plotter-config-jparmfacade.jar       | Bin 2319 -> 2331 bytes
 .../sas/otb/jparmfacade/jParmFacade.java      |   2 +-
 .../otb/jparmfacade/jParmFacadeAdapter.java   |   2 +-
 .../otb/jparmfacade/jParmFacadeInterface.java |   2 +-
 .../otb/jparmfacade/jParmFacadeServer.java    |   2 +-
 ...stron_lofar_otb_jparmfacade_jParmFacade.cc |   2 +-
 .../sas/otb/jparmfacade/test/tParmFacade.java |   2 +-
 .../jparmfacade/test/tRemoteParmFacade.java   |   2 +-
 .../astron/lofar/sas/otb/jrsp/ADOStatus.java  |   2 +-
 .../nl/astron/lofar/sas/otb/jrsp/Board.java   |   2 +-
 .../lofar/sas/otb/jrsp/BoardStatus.java       |   2 +-
 .../nl/astron/lofar/sas/otb/jrsp/IMask.java   |   2 +-
 .../nl/astron/lofar/sas/otb/jrsp/RCUMask.java |   2 +-
 .../astron/lofar/sas/otb/jrsp/RCUStatus.java  |   2 +-
 .../nl/astron/lofar/sas/otb/jrsp/RSPMask.java |   2 +-
 .../astron/lofar/sas/otb/jrsp/SyncStatus.java |   2 +-
 .../lofar/sas/otb/jrsp/WGRegisterType.java    |   2 +-
 SAS/OTDB/include/OTDB/Campaign.h              |   2 +-
 SAS/OTDB/include/OTDB/CampaignInfo.h          |   2 +-
 SAS/OTDB/include/OTDB/ClassifConv.h           |   2 +-
 SAS/OTDB/include/OTDB/Converter.h             |   2 +-
 SAS/OTDB/include/OTDB/DefaultTemplate.h       |   2 +-
 SAS/OTDB/include/OTDB/OTDBaction.h            |   2 +-
 SAS/OTDB/include/OTDB/OTDBactionList.h        |   2 +-
 SAS/OTDB/include/OTDB/OTDBconnection.h        |   2 +-
 SAS/OTDB/include/OTDB/OTDBconstants.h         |   2 +-
 SAS/OTDB/include/OTDB/OTDBcontrol.h           |   2 +-
 SAS/OTDB/include/OTDB/OTDBevent.h             |   2 +-
 SAS/OTDB/include/OTDB/OTDBeventList.h         |   2 +-
 SAS/OTDB/include/OTDB/OTDBnode.h              |   2 +-
 SAS/OTDB/include/OTDB/OTDBparam.h             |   2 +-
 SAS/OTDB/include/OTDB/OTDBtree.h              |   2 +-
 SAS/OTDB/include/OTDB/OTDBtypes.h             |   2 +-
 SAS/OTDB/include/OTDB/OTDBvalue.h             |   2 +-
 SAS/OTDB/include/OTDB/ParamTypeConv.h         |   2 +-
 SAS/OTDB/include/OTDB/TreeMaintenance.h       |   2 +-
 SAS/OTDB/include/OTDB/TreeState.h             |   2 +-
 SAS/OTDB/include/OTDB/TreeStateConv.h         |   2 +-
 SAS/OTDB/include/OTDB/TreeTypeConv.h          |   2 +-
 SAS/OTDB/include/OTDB/TreeValue.h             |   2 +-
 SAS/OTDB/include/OTDB/UnitConv.h              |   2 +-
 SAS/OTDB/include/OTDB/VICnodeDef.h            |   2 +-
 SAS/OTDB/include/OTDB/misc.h                  |   2 +-
 SAS/OTDB/include/OTDB/wSpaceSplit.h           |   2 +-
 SAS/OTDB/sql/addComponentToVT_func.sql        |   2 +-
 SAS/OTDB/sql/addKVT_func.sql                  |   2 +-
 SAS/OTDB/sql/addPICparam_func.sql             |   2 +-
 SAS/OTDB/sql/addTreeState_func.sql            |   2 +-
 SAS/OTDB/sql/assignProcessType_func.sql       |   2 +-
 SAS/OTDB/sql/buildTemplateTree_func.sql       |   2 +-
 SAS/OTDB/sql/campaignAPI.sql                  |   2 +-
 SAS/OTDB/sql/classify_func.sql                |   2 +-
 SAS/OTDB/sql/copyTree_func.sql                |   2 +-
 SAS/OTDB/sql/copyVHtree_func.sql              |   2 +-
 SAS/OTDB/sql/copyVTtree_func.sql              |   2 +-
 SAS/OTDB/sql/create_PIC_tables.sql            |   2 +-
 SAS/OTDB/sql/create_VIC_tables.sql            |   2 +-
 SAS/OTDB/sql/create_base_tables.sql           |   2 +-
 SAS/OTDB/sql/create_event_action.sql          |   2 +-
 SAS/OTDB/sql/create_log_system.sql            |   2 +-
 SAS/OTDB/sql/create_rules.sql                 |   2 +-
 SAS/OTDB/sql/create_security.sql              |   2 +-
 SAS/OTDB/sql/create_tree_table.sql            |   2 +-
 SAS/OTDB/sql/create_types.sql                 |   2 +-
 SAS/OTDB/sql/deleteTree_func.sql              |   2 +-
 SAS/OTDB/sql/deleteVCnode_func.sql            |   2 +-
 SAS/OTDB/sql/deleteVTnode_func.sql            |   2 +-
 SAS/OTDB/sql/dupVTnode_func.sql               |   2 +-
 SAS/OTDB/sql/exportMetadata_func.sql          |   2 +-
 SAS/OTDB/sql/exportResultTree_func.sql        |   2 +-
 SAS/OTDB/sql/exportTree_func.sql              |   2 +-
 SAS/OTDB/sql/getAllTaskID_func.sql            |   2 +-
 SAS/OTDB/sql/getBrokenHardware_func.sql       |   2 +-
 SAS/OTDB/sql/getDefaultTemplates_func.sql     |   2 +-
 SAS/OTDB/sql/getExecutableTrees_func.sql      |   2 +-
 SAS/OTDB/sql/getModifiedTrees_func.sql        |   2 +-
 SAS/OTDB/sql/getMomID2treeID_func.sql         |   2 +-
 SAS/OTDB/sql/getNode_func.sql                 |   2 +-
 SAS/OTDB/sql/getPICitemList_func.sql          |   2 +-
 SAS/OTDB/sql/getPICparamDef_func.sql          |   2 +-
 SAS/OTDB/sql/getSchedulerInfo_func.sql        |   2 +-
 SAS/OTDB/sql/getStateList_func.sql            |   2 +-
 SAS/OTDB/sql/getTopNode_func.sql              |   2 +-
 SAS/OTDB/sql/getTreeGroup_func.sql            |   2 +-
 SAS/OTDB/sql/getTreeInfo_func.sql             |   2 +-
 SAS/OTDB/sql/getTreeList_func.sql             |   2 +-
 SAS/OTDB/sql/getTreesInPeriod_func.sql        |   2 +-
 SAS/OTDB/sql/getVCNodeList_func.sql           |   2 +-
 SAS/OTDB/sql/getVCparams_func.sql             |   2 +-
 SAS/OTDB/sql/getVHitemList_func.sql           |   2 +-
 SAS/OTDB/sql/getVICnodeDef_func.sql           |   2 +-
 SAS/OTDB/sql/getVICparamDef_func.sql          |   2 +-
 SAS/OTDB/sql/getVTchildren_func.sql           |   2 +-
 SAS/OTDB/sql/getVTitemList_func.sql           |   2 +-
 SAS/OTDB/sql/getVTitem_func.sql               |   2 +-
 SAS/OTDB/sql/hVICsearchParamID_func.sql       |   2 +-
 SAS/OTDB/sql/instanciateTree_func.sql         |   2 +-
 SAS/OTDB/sql/isTopComponent_func.sql          |   2 +-
 SAS/OTDB/sql/misc_func.sql                    |   2 +-
 SAS/OTDB/sql/newTree_func.sql                 |   2 +-
 SAS/OTDB/sql/saveSchedulerInfo_func.sql       |   2 +-
 SAS/OTDB/sql/saveVCnode_func.sql              |   2 +-
 SAS/OTDB/sql/saveVICparamDef_func.sql         |   2 +-
 SAS/OTDB/sql/searchPICinPeriod_func.sql       |   2 +-
 SAS/OTDB/sql/searchVHinPeriod_func.sql        |   2 +-
 SAS/OTDB/sql/security_func.sql                |   2 +-
 SAS/OTDB/sql/setDescription_func.sql          |   2 +-
 SAS/OTDB/sql/setMomInfo_func.sql              |   2 +-
 SAS/OTDB/sql/setSchedule_func.sql             |   2 +-
 SAS/OTDB/sql/setTreeState_func.sql            |   2 +-
 SAS/OTDB/sql/updateVTnode_func.sql            |   2 +-
 SAS/OTDB/src/Campaign.cc                      |   2 +-
 SAS/OTDB/src/CampaignInfo.cc                  |   2 +-
 SAS/OTDB/src/Converter.cc                     |   2 +-
 SAS/OTDB/src/DefaultTemplate.cc               |   2 +-
 SAS/OTDB/src/OTDBaction.cc                    |   2 +-
 SAS/OTDB/src/OTDBactionList.cc                |   2 +-
 SAS/OTDB/src/OTDBconnection.cc                |   2 +-
 SAS/OTDB/src/OTDBcontrol.cc                   |   2 +-
 SAS/OTDB/src/OTDBevent.cc                     |   2 +-
 SAS/OTDB/src/OTDBeventList.cc                 |   2 +-
 SAS/OTDB/src/OTDBnode.cc                      |   2 +-
 SAS/OTDB/src/OTDBparam.cc                     |   2 +-
 SAS/OTDB/src/OTDBtree.cc                      |   2 +-
 SAS/OTDB/src/OTDBvalue.cc                     |   2 +-
 SAS/OTDB/src/TreeMaintenance.cc               |   2 +-
 SAS/OTDB/src/TreeState.cc                     |   2 +-
 SAS/OTDB/src/TreeValue.cc                     |   2 +-
 SAS/OTDB/src/VICnodeDef.cc                    |   2 +-
 SAS/OTDB/src/loadCompFile.cc                  |   2 +-
 SAS/OTDB/src/misc.cc                          |   2 +-
 SAS/OTDB/src/setStatus.cc                     |   2 +-
 SAS/OTDB/src/wSpaceSplit.cc                   |   2 +-
 SAS/OTDB/test/tBrokenHardware.cc              |   2 +-
 SAS/OTDB/test/tCampaign.cc                    |   2 +-
 SAS/OTDB/test/tConnection.cc                  |   2 +-
 SAS/OTDB/test/tMetadata.cc                    |   2 +-
 SAS/OTDB/test/tPICtree.cc                     |   2 +-
 SAS/OTDB/test/tPICvalue.cc                    |   2 +-
 SAS/OTDB/test/tParamTypeConv.cc               |   2 +-
 SAS/OTDB/test/tQueryPIC.cc                    |   2 +-
 SAS/OTDB/test/tVHtree.cc                      |   2 +-
 SAS/OTDB/test/tVHvalue.cc                     |   2 +-
 SAS/OTDB/test/tVICcomp.cc                     |   2 +-
 SAS/OTDB/test/tVTtree.cc                      |   2 +-
 .../org/astron/basesim/BaseSimTreeModel.java  |   2 +-
 .../src/org/astron/basesim/Configuration.java |   2 +-
 .../src/org/astron/basesim/Connection.java    |   2 +-
 .../org/astron/basesim/ConnectionStep.java    |   2 +-
 .../org/astron/basesim/ContHandlerSim.java    |   2 +-
 .../org/astron/basesim/ErrorHandlerSim.java   |   2 +-
 .../src/org/astron/basesim/Graph.java         |   2 +-
 .../org/astron/basesim/GraphActionEvent.java  |   2 +-
 .../astron/basesim/GraphActionListener.java   |   2 +-
 .../org/astron/basesim/GraphComposite.java    |   2 +-
 .../org/astron/basesim/GraphDataHolder.java   |   2 +-
 .../src/org/astron/basesim/GraphDiagram.java  |   2 +-
 .../org/astron/basesim/GraphException.java    |   2 +-
 .../src/org/astron/basesim/GraphManager.java  |   2 +-
 .../org/astron/basesim/GraphParamHolder.java  |   2 +-
 .../src/org/astron/basesim/GraphSimul.java    |   2 +-
 .../src/org/astron/basesim/GraphStep.java     |   2 +-
 .../org/astron/basesim/GraphWorkHolder.java   |   2 +-
 .../src/org/astron/basesim/JBaseSim.java      |   2 +-
 .../src/org/astron/basesim/JTestGraph.java    |   2 +-
 .../org/astron/basesim/LayoutCentered.java    |   2 +-
 .../org/astron/basesim/LayoutController.java  |   2 +-
 .../org/astron/basesim/LayoutDataHolder.java  |   2 +-
 .../src/org/astron/basesim/LayoutFlow.java    |   2 +-
 .../src/org/astron/basesim/LayoutSimul.java   |   2 +-
 .../src/org/astron/basesim/Main.java          |   2 +-
 .../src/org/astron/basesim/MessageGraph.java  |   2 +-
 .../src/org/astron/basesim/MessageXML.java    |   2 +-
 .../org/astron/basesim/SelectionManager.java  |   2 +-
 .../src/org/astron/basesim/TestMain.java      |   2 +-
 .../src/org/astron/util/Sample.java           |   2 +-
 .../src/org/astron/util/gui/JNotifier.java    |   2 +-
 .../src/org/astron/util/gui/MessageEvent.java |   2 +-
 .../org/astron/util/gui/MessageListener.java  |   2 +-
 support/tools/wrapexec/src/wrapexec.cc        |   2 +-
 1633 files changed, 1632 insertions(+), 1632 deletions(-)

diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/BasicExpr.h b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/BasicExpr.h
index 4fe0abc8b8e..2f5779952c0 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/BasicExpr.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/BasicExpr.h
@@ -3,7 +3,7 @@
 //#
 //# Copyright (C) 2009
 //# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //# This program is free software; you can redistribute it and/or modify
 //# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/Cache.h b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/Cache.h
index 92c63291d05..bf0caaba43b 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/Cache.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/Cache.h
@@ -2,7 +2,7 @@
 //#
 //# Copyright (C) 2009
 //# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //# This program is free software; you can redistribute it and/or modify
 //# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ConditionNumber.h b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ConditionNumber.h
index d6c7353a4e1..ecaf7ad8790 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ConditionNumber.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ConditionNumber.h
@@ -3,7 +3,7 @@
 //#
 //# Copyright (C) 2009
 //# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //# This program is free software; you can redistribute it and/or modify
 //# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/Element.h b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/Element.h
index 2eb3690f573..29e123513cb 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/Element.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/Element.h
@@ -3,7 +3,7 @@
 //#
 //# Copyright (C) 2009
 //# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //# This program is free software; you can redistribute it and/or modify
 //# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ExprAdaptors.h b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ExprAdaptors.h
index a15cc4e5808..5e1eb558230 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ExprAdaptors.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ExprAdaptors.h
@@ -2,7 +2,7 @@
 //#
 //# Copyright (C) 2009
 //# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //# This program is free software; you can redistribute it and/or modify
 //# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ExprId.h b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ExprId.h
index 910c853ac5b..232c1c162e6 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ExprId.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ExprId.h
@@ -3,7 +3,7 @@
 //#
 //# Copyright (C) 2009
 //# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //# This program is free software; you can redistribute it and/or modify
 //# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ExprValue.h b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ExprValue.h
index fd8187858eb..d804a568c79 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ExprValue.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ExprValue.h
@@ -2,7 +2,7 @@
 //#
 //# Copyright (C) 2009
 //# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //# This program is free software; you can redistribute it and/or modify
 //# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ExprValueIterator.h b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ExprValueIterator.h
index 435d88a017c..1d79e012f64 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ExprValueIterator.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ExprValueIterator.h
@@ -2,7 +2,7 @@
 //#
 //# Copyright (C) 2009
 //# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //# This program is free software; you can redistribute it and/or modify
 //# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ExprValueView.h b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ExprValueView.h
index b752812de49..4b87ffdeb18 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ExprValueView.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ExprValueView.h
@@ -3,7 +3,7 @@
 //#
 //# Copyright (C) 2009
 //# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //# This program is free software; you can redistribute it and/or modify
 //# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ExprVisData.h b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ExprVisData.h
index 23e1e29b59a..d7da107bd57 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ExprVisData.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ExprVisData.h
@@ -3,7 +3,7 @@
 //#
 //# Copyright (C) 2007
 //# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //# This program is free software; you can redistribute it and/or modify
 //# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/FlagArray.h b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/FlagArray.h
index bc2a1b433f4..6ce711d3034 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/FlagArray.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/FlagArray.h
@@ -3,7 +3,7 @@
 //#
 //# Copyright (C) 2009
 //# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //# This program is free software; you can redistribute it and/or modify
 //# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/FlagIf.h b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/FlagIf.h
index 45f27c48fe8..93670d5f19c 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/FlagIf.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/FlagIf.h
@@ -3,7 +3,7 @@
 //#
 //# Copyright (C) 2009
 //# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //# This program is free software; you can redistribute it and/or modify
 //# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/Literal.h b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/Literal.h
index 65d3f4163a3..e4244b1c79c 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/Literal.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/Literal.h
@@ -2,7 +2,7 @@
 //#
 //# Copyright (C) 2009
 //# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //# This program is free software; you can redistribute it and/or modify
 //# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/MatrixMul2.h b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/MatrixMul2.h
index f94f7d67fcb..304707b8228 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/MatrixMul2.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/MatrixMul2.h
@@ -2,7 +2,7 @@
 //#
 //# Copyright (C) 2009
 //# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //# This program is free software; you can redistribute it and/or modify
 //# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/MatrixMul3.h b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/MatrixMul3.h
index 1b7d7f8403f..da32f456e07 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/MatrixMul3.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/MatrixMul3.h
@@ -3,7 +3,7 @@
 //#
 //# Copyright (C) 2009
 //# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //# This program is free software; you can redistribute it and/or modify
 //# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/MatrixSum.h b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/MatrixSum.h
index 25d5a028e76..b1c32c9b6d8 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/MatrixSum.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/MatrixSum.h
@@ -3,7 +3,7 @@
 //#
 //# Copyright (C) 2009
 //# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //# This program is free software; you can redistribute it and/or modify
 //# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/MergeFlags.h b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/MergeFlags.h
index 6152a0c3e40..03ee3c96c7b 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/MergeFlags.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/MergeFlags.h
@@ -4,7 +4,7 @@
 //#
 //# Copyright (C) 2009
 //# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //# This program is free software; you can redistribute it and/or modify
 //# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/RefCounting.h b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/RefCounting.h
index 06087a0143e..e10179006a1 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/RefCounting.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/RefCounting.h
@@ -2,7 +2,7 @@
 //#
 //# Copyright (C) 2009
 //# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //# This program is free software; you can redistribute it and/or modify
 //# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/Resampler.h b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/Resampler.h
index f0cd66b32a9..b688ba9f875 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/Resampler.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/Resampler.h
@@ -2,7 +2,7 @@
 //#
 //# Copyright (C) 2009
 //# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //# This program is free software; you can redistribute it and/or modify
 //# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ScalarMatrixMul.h b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ScalarMatrixMul.h
index 8384af7f6d1..49339b0dcaa 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ScalarMatrixMul.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/ScalarMatrixMul.h
@@ -3,7 +3,7 @@
 //#
 //# Copyright (C) 2009
 //# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //# This program is free software; you can redistribute it and/or modify
 //# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/StationUVW.h b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/StationUVW.h
index 2e16593f591..87a57fcd194 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/StationUVW.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/Expr/StationUVW.h
@@ -2,7 +2,7 @@
 //#
 //# Copyright (C) 2009
 //# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //# This program is free software; you can redistribute it and/or modify
 //# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/include/BBSKernel/ExprSet.h b/CEP/Calibration/BBSKernel/include/BBSKernel/ExprSet.h
index 035da2c4e63..4b68d95a280 100644
--- a/CEP/Calibration/BBSKernel/include/BBSKernel/ExprSet.h
+++ b/CEP/Calibration/BBSKernel/include/BBSKernel/ExprSet.h
@@ -3,7 +3,7 @@
 //#
 //# Copyright (C) 2009
 //# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //# This program is free software; you can redistribute it and/or modify
 //# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/src/Expr/Cache.cc b/CEP/Calibration/BBSKernel/src/Expr/Cache.cc
index 0afe3231146..0a360c3d649 100644
--- a/CEP/Calibration/BBSKernel/src/Expr/Cache.cc
+++ b/CEP/Calibration/BBSKernel/src/Expr/Cache.cc
@@ -2,7 +2,7 @@
 //#
 //# Copyright (C) 2009
 //# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //# This program is free software; you can redistribute it and/or modify
 //# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/src/Expr/ConditionNumber.cc b/CEP/Calibration/BBSKernel/src/Expr/ConditionNumber.cc
index 2a9c1ac1cb3..d0ac99c6e17 100644
--- a/CEP/Calibration/BBSKernel/src/Expr/ConditionNumber.cc
+++ b/CEP/Calibration/BBSKernel/src/Expr/ConditionNumber.cc
@@ -3,7 +3,7 @@
 //#
 //# Copyright (C) 2009
 //# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //# This program is free software; you can redistribute it and/or modify
 //# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/src/Expr/Element.cc b/CEP/Calibration/BBSKernel/src/Expr/Element.cc
index 68fbdffa2bd..942f6015d2b 100644
--- a/CEP/Calibration/BBSKernel/src/Expr/Element.cc
+++ b/CEP/Calibration/BBSKernel/src/Expr/Element.cc
@@ -3,7 +3,7 @@
 //#
 //# Copyright (C) 2009
 //# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //# This program is free software; you can redistribute it and/or modify
 //# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/src/Expr/ExprAdaptors.cc b/CEP/Calibration/BBSKernel/src/Expr/ExprAdaptors.cc
index e9cf8d47bbc..b11c5f7e05b 100644
--- a/CEP/Calibration/BBSKernel/src/Expr/ExprAdaptors.cc
+++ b/CEP/Calibration/BBSKernel/src/Expr/ExprAdaptors.cc
@@ -2,7 +2,7 @@
 //#
 //# Copyright (C) 2009
 //# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //# This program is free software; you can redistribute it and/or modify
 //# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/src/Expr/ExprValue.cc b/CEP/Calibration/BBSKernel/src/Expr/ExprValue.cc
index e4991160a76..8b3929e244d 100644
--- a/CEP/Calibration/BBSKernel/src/Expr/ExprValue.cc
+++ b/CEP/Calibration/BBSKernel/src/Expr/ExprValue.cc
@@ -2,7 +2,7 @@
 //#
 //# Copyright (C) 2009
 //# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //# This program is free software; you can redistribute it and/or modify
 //# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/src/Expr/ExprValueIterator.cc b/CEP/Calibration/BBSKernel/src/Expr/ExprValueIterator.cc
index aef2c8d74a8..9e93b6770b1 100644
--- a/CEP/Calibration/BBSKernel/src/Expr/ExprValueIterator.cc
+++ b/CEP/Calibration/BBSKernel/src/Expr/ExprValueIterator.cc
@@ -2,7 +2,7 @@
 //#
 //# Copyright (C) 2009
 //# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //# This program is free software; you can redistribute it and/or modify
 //# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/src/Expr/ExprValueView.cc b/CEP/Calibration/BBSKernel/src/Expr/ExprValueView.cc
index d8d16449435..dab6424991c 100644
--- a/CEP/Calibration/BBSKernel/src/Expr/ExprValueView.cc
+++ b/CEP/Calibration/BBSKernel/src/Expr/ExprValueView.cc
@@ -3,7 +3,7 @@
 //#
 //# Copyright (C) 2009
 //# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //# This program is free software; you can redistribute it and/or modify
 //# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/src/Expr/ExprVisData.cc b/CEP/Calibration/BBSKernel/src/Expr/ExprVisData.cc
index b2af6fd02f5..61af1fc8def 100644
--- a/CEP/Calibration/BBSKernel/src/Expr/ExprVisData.cc
+++ b/CEP/Calibration/BBSKernel/src/Expr/ExprVisData.cc
@@ -3,7 +3,7 @@
 //#
 //# Copyright (C) 2007
 //# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //# This program is free software; you can redistribute it and/or modify
 //# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/src/Expr/FlagArray.cc b/CEP/Calibration/BBSKernel/src/Expr/FlagArray.cc
index 682b31f9036..5911a8df519 100644
--- a/CEP/Calibration/BBSKernel/src/Expr/FlagArray.cc
+++ b/CEP/Calibration/BBSKernel/src/Expr/FlagArray.cc
@@ -3,7 +3,7 @@
 //#
 //# Copyright (C) 2009
 //# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //# This program is free software; you can redistribute it and/or modify
 //# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/src/Expr/Literal.cc b/CEP/Calibration/BBSKernel/src/Expr/Literal.cc
index 349d25fe278..4277844e9e4 100644
--- a/CEP/Calibration/BBSKernel/src/Expr/Literal.cc
+++ b/CEP/Calibration/BBSKernel/src/Expr/Literal.cc
@@ -2,7 +2,7 @@
 //#
 //# Copyright (C) 2009
 //# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //# This program is free software; you can redistribute it and/or modify
 //# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/src/Expr/MatrixMul2.cc b/CEP/Calibration/BBSKernel/src/Expr/MatrixMul2.cc
index 80d570846fb..15969e6321c 100644
--- a/CEP/Calibration/BBSKernel/src/Expr/MatrixMul2.cc
+++ b/CEP/Calibration/BBSKernel/src/Expr/MatrixMul2.cc
@@ -2,7 +2,7 @@
 //#
 //# Copyright (C) 2009
 //# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //# This program is free software; you can redistribute it and/or modify
 //# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/src/Expr/MatrixMul3.cc b/CEP/Calibration/BBSKernel/src/Expr/MatrixMul3.cc
index 01205476e09..ab657e664f0 100644
--- a/CEP/Calibration/BBSKernel/src/Expr/MatrixMul3.cc
+++ b/CEP/Calibration/BBSKernel/src/Expr/MatrixMul3.cc
@@ -3,7 +3,7 @@
 //#
 //# Copyright (C) 2009
 //# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //# This program is free software; you can redistribute it and/or modify
 //# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/src/Expr/MatrixSum.cc b/CEP/Calibration/BBSKernel/src/Expr/MatrixSum.cc
index 0b8a229058d..6fb22adc880 100644
--- a/CEP/Calibration/BBSKernel/src/Expr/MatrixSum.cc
+++ b/CEP/Calibration/BBSKernel/src/Expr/MatrixSum.cc
@@ -3,7 +3,7 @@
 //#
 //# Copyright (C) 2009
 //# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //# This program is free software; you can redistribute it and/or modify
 //# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/src/Expr/Resampler.cc b/CEP/Calibration/BBSKernel/src/Expr/Resampler.cc
index a79e819e034..c28f3f8b972 100644
--- a/CEP/Calibration/BBSKernel/src/Expr/Resampler.cc
+++ b/CEP/Calibration/BBSKernel/src/Expr/Resampler.cc
@@ -2,7 +2,7 @@
 //#
 //# Copyright (C) 2009
 //# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //# This program is free software; you can redistribute it and/or modify
 //# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/src/Expr/ScalarMatrixMul.cc b/CEP/Calibration/BBSKernel/src/Expr/ScalarMatrixMul.cc
index 3fcb4c92677..dd21233b0e8 100644
--- a/CEP/Calibration/BBSKernel/src/Expr/ScalarMatrixMul.cc
+++ b/CEP/Calibration/BBSKernel/src/Expr/ScalarMatrixMul.cc
@@ -3,7 +3,7 @@
 //#
 //# Copyright (C) 2009
 //# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //# This program is free software; you can redistribute it and/or modify
 //# it under the terms of the GNU General Public License as published by
diff --git a/CEP/Calibration/BBSKernel/src/Expr/StationUVW.cc b/CEP/Calibration/BBSKernel/src/Expr/StationUVW.cc
index 1324eff88fa..305edd1c4f4 100644
--- a/CEP/Calibration/BBSKernel/src/Expr/StationUVW.cc
+++ b/CEP/Calibration/BBSKernel/src/Expr/StationUVW.cc
@@ -2,7 +2,7 @@
 //#
 //# Copyright (C) 2009
 //# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //# This program is free software; you can redistribute it and/or modify
 //# it under the terms of the GNU General Public License as published by
diff --git a/CEP/LMWCommon/include/LMWCommon/MWIos.h b/CEP/LMWCommon/include/LMWCommon/MWIos.h
index 55ab96b4c4a..a7af19bea10 100644
--- a/CEP/LMWCommon/include/LMWCommon/MWIos.h
+++ b/CEP/LMWCommon/include/LMWCommon/MWIos.h
@@ -2,7 +2,7 @@
 //#
 //# Copyright (C) 2005
 //# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //# This program is free software; you can redistribute it and/or modify
 //# it under the terms of the GNU General Public License as published by
diff --git a/CEP/ParmDB/src/startparmdbdistr b/CEP/ParmDB/src/startparmdbdistr
index e72cc3d17fc..23ff2adb89c 100755
--- a/CEP/ParmDB/src/startparmdbdistr
+++ b/CEP/ParmDB/src/startparmdbdistr
@@ -4,7 +4,7 @@
 #
 # Copyright (C) 2009
 # ASTRON (Netherlands Foundation for Research in Astronomy)
-# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/CMake/LofarCTest.cmake b/CMake/LofarCTest.cmake
index 780becc9c1d..7b5f74ea1be 100644
--- a/CMake/LofarCTest.cmake
+++ b/CMake/LofarCTest.cmake
@@ -2,7 +2,7 @@
 
 #  Copyright (C) 2008-2010
 #  ASTRON (Netherlands Foundation for Research in Astronomy)
-#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
diff --git a/CMake/LofarConfig.cmake b/CMake/LofarConfig.cmake
index c06179cf361..bbdd8f1dc25 100644
--- a/CMake/LofarConfig.cmake
+++ b/CMake/LofarConfig.cmake
@@ -3,7 +3,7 @@
 
 #  Copyright (C) 2008-2010
 #  ASTRON (Netherlands Foundation for Research in Astronomy)
-#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
diff --git a/CMake/LofarFindPackage.cmake b/CMake/LofarFindPackage.cmake
index b5e37f2713f..431dc793d88 100644
--- a/CMake/LofarFindPackage.cmake
+++ b/CMake/LofarFindPackage.cmake
@@ -15,7 +15,7 @@
 
 #  Copyright (C) 2008-2010
 #  ASTRON (Netherlands Foundation for Research in Astronomy)
-#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
diff --git a/CMake/LofarGeneral.cmake b/CMake/LofarGeneral.cmake
index 8b3d76537ac..cd66770fd08 100644
--- a/CMake/LofarGeneral.cmake
+++ b/CMake/LofarGeneral.cmake
@@ -13,7 +13,7 @@
 
 #  Copyright (C) 2008-2010
 #  ASTRON (Netherlands Foundation for Research in Astronomy)
-#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
diff --git a/CMake/LofarInit.cmake b/CMake/LofarInit.cmake
index 21973cd4f2b..704144b3daa 100644
--- a/CMake/LofarInit.cmake
+++ b/CMake/LofarInit.cmake
@@ -29,7 +29,7 @@
 
 #  Copyright (C) 2008-2010
 #  ASTRON (Netherlands Foundation for Research in Astronomy)
-#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
diff --git a/CMake/LofarMacros.cmake b/CMake/LofarMacros.cmake
index 0e5471072c1..0cdc589cabe 100644
--- a/CMake/LofarMacros.cmake
+++ b/CMake/LofarMacros.cmake
@@ -15,7 +15,7 @@
 #
 #  Copyright (C) 2008-2009
 #  ASTRON (Netherlands Foundation for Research in Astronomy)
-#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
diff --git a/CMake/LofarOptions.cmake b/CMake/LofarOptions.cmake
index e5405be7396..1eeea88313f 100644
--- a/CMake/LofarOptions.cmake
+++ b/CMake/LofarOptions.cmake
@@ -2,7 +2,7 @@
 
 #  Copyright (C) 2008-2010
 #  ASTRON (Netherlands Foundation for Research in Astronomy)
-#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
diff --git a/CMake/LofarPackage.cmake b/CMake/LofarPackage.cmake
index 3cd29c83396..5a738521fbf 100644
--- a/CMake/LofarPackage.cmake
+++ b/CMake/LofarPackage.cmake
@@ -52,7 +52,7 @@
 
 #  Copyright (C) 2008-2010
 #  ASTRON (Netherlands Foundation for Research in Astronomy)
-#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
diff --git a/CMake/LofarPackageVersion.cmake b/CMake/LofarPackageVersion.cmake
index 9f5c1fcb02d..0c5fa3ea5ca 100644
--- a/CMake/LofarPackageVersion.cmake
+++ b/CMake/LofarPackageVersion.cmake
@@ -19,7 +19,7 @@
 #
 #  Copyright (C) 2010
 #  ASTRON (Netherlands Foundation for Research in Astronomy)
-#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
diff --git a/CMake/LofarSubversion.cmake b/CMake/LofarSubversion.cmake
index 539487b89da..5af64883e59 100644
--- a/CMake/LofarSubversion.cmake
+++ b/CMake/LofarSubversion.cmake
@@ -12,7 +12,7 @@
 #
 #  Copyright (C) 2010
 #  ASTRON (Netherlands Foundation for Research in Astronomy)
-#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
diff --git a/CMake/LofarVariants.cmake b/CMake/LofarVariants.cmake
index 760ccdee196..971b6ee64e9 100644
--- a/CMake/LofarVariants.cmake
+++ b/CMake/LofarVariants.cmake
@@ -6,7 +6,7 @@
 
 #  Copyright (C) 2008-2010
 #  ASTRON (Netherlands Foundation for Research in Astronomy)
-#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
diff --git a/CMake/MACAddProtocol.cmake b/CMake/MACAddProtocol.cmake
index 5d3adfc48ab..672ece06aee 100644
--- a/CMake/MACAddProtocol.cmake
+++ b/CMake/MACAddProtocol.cmake
@@ -16,7 +16,7 @@
 
 #  Copyright (C) 2008-2011
 #  ASTRON (Netherlands Foundation for Research in Astronomy)
-#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
diff --git a/CMake/PythonInstall.cmake b/CMake/PythonInstall.cmake
index c1bb38568da..b62fff3eaeb 100644
--- a/CMake/PythonInstall.cmake
+++ b/CMake/PythonInstall.cmake
@@ -5,7 +5,7 @@
 
 # Copyright (C) 2008-2009
 # ASTRON (Netherlands Foundation for Research in Astronomy)
-# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/CMake/UpdatePackageVersion.cmake.in b/CMake/UpdatePackageVersion.cmake.in
index 83fd252716c..6732c27242c 100644
--- a/CMake/UpdatePackageVersion.cmake.in
+++ b/CMake/UpdatePackageVersion.cmake.in
@@ -16,7 +16,7 @@
 #
 #  Copyright (C) 2010
 #  ASTRON (Netherlands Foundation for Research in Astronomy)
-#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
diff --git a/CMake/docscripts/MakeDoxyDoc.cmake.in b/CMake/docscripts/MakeDoxyDoc.cmake.in
index 20eec56b079..483023cdabf 100644
--- a/CMake/docscripts/MakeDoxyDoc.cmake.in
+++ b/CMake/docscripts/MakeDoxyDoc.cmake.in
@@ -8,7 +8,7 @@
 #
 #  Copyright (C) 2010
 #  ASTRON (Netherlands Foundation for Research in Astronomy)
-#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
diff --git a/CMake/docscripts/slash2spanning.pl b/CMake/docscripts/slash2spanning.pl
index df30c865b4a..2c178714591 100755
--- a/CMake/docscripts/slash2spanning.pl
+++ b/CMake/docscripts/slash2spanning.pl
@@ -6,7 +6,7 @@
 #
 #  Copyright (C) 2002
 #  ASTRON (Netherlands Foundation for Research in Astronomy)
-#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
diff --git a/CMake/gen_LofarPackageList_cmake.sh b/CMake/gen_LofarPackageList_cmake.sh
index 9636ef36def..ea5ceb395c6 100755
--- a/CMake/gen_LofarPackageList_cmake.sh
+++ b/CMake/gen_LofarPackageList_cmake.sh
@@ -4,7 +4,7 @@
 #
 #  Copyright (C) 2009
 #  ASTRON (Netherlands Foundation for Research in Astronomy)
-#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
diff --git a/CMake/testscripts/assay b/CMake/testscripts/assay
index 2b52c72b9d7..d97460d4562 100755
--- a/CMake/testscripts/assay
+++ b/CMake/testscripts/assay
@@ -4,7 +4,7 @@
 #
 #  Copyright (C) 2001
 #  ASTRON (Netherlands Foundation for Research in Astronomy)
-#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
diff --git a/CMake/testscripts/runctest.sh.in b/CMake/testscripts/runctest.sh.in
index 0b0017d1273..da862611197 100755
--- a/CMake/testscripts/runctest.sh.in
+++ b/CMake/testscripts/runctest.sh.in
@@ -4,7 +4,7 @@
 #
 #  Copyright (C) 2009
 #  ASTRON (Netherlands Foundation for Research in Astronomy)
-#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
diff --git a/CMake/testscripts/runtest.sh b/CMake/testscripts/runtest.sh
index dd7e8316a81..977b1358847 100755
--- a/CMake/testscripts/runtest.sh
+++ b/CMake/testscripts/runtest.sh
@@ -4,7 +4,7 @@
 #
 #  Copyright (C) 2002
 #  ASTRON (Netherlands Foundation for Research in Astronomy)
-#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
diff --git a/JAVA/GUI/Plotter/PlotterConfig/src/plotter_config.properties b/JAVA/GUI/Plotter/PlotterConfig/src/plotter_config.properties
index 4aa02b7c74b..e453ad61c10 100644
--- a/JAVA/GUI/Plotter/PlotterConfig/src/plotter_config.properties
+++ b/JAVA/GUI/Plotter/PlotterConfig/src/plotter_config.properties
@@ -5,7 +5,7 @@
 #
 # Copyright (C) 2002-2007
 # ASTRON (Netherlands Foundation for Research in Astronomy)
-# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/IPlot.java b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/IPlot.java
index 574d57aa7fe..cac98cc37eb 100644
--- a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/IPlot.java
+++ b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/IPlot.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/IPlotDataAccess.java b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/IPlotDataAccess.java
index bb91f1f0f03..8acdf01995f 100644
--- a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/IPlotDataAccess.java
+++ b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/IPlotDataAccess.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/IPlotDataExport.java b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/IPlotDataExport.java
index 7a0a7cef2a9..6bc91884bdd 100644
--- a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/IPlotDataExport.java
+++ b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/IPlotDataExport.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/PlotConstants.java b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/PlotConstants.java
index 86f3c2e6231..6530cdbd714 100644
--- a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/PlotConstants.java
+++ b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/PlotConstants.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/PlotController.java b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/PlotController.java
index 6fbcdb12b10..308b5cf6a27 100644
--- a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/PlotController.java
+++ b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/PlotController.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/PlotDataManager.java b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/PlotDataManager.java
index 94129f10d3f..1e920cee502 100644
--- a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/PlotDataManager.java
+++ b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/PlotDataManager.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/PlotPanel.java b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/PlotPanel.java
index 10753e6b8e6..cb283bfac85 100644
--- a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/PlotPanel.java
+++ b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/PlotPanel.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/PlotSGTImpl.java b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/PlotSGTImpl.java
index 73879c18b34..783489c775d 100644
--- a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/PlotSGTImpl.java
+++ b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/PlotSGTImpl.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/EmptyDataSetException.java b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/EmptyDataSetException.java
index ee79c28c344..78a4af74795 100644
--- a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/EmptyDataSetException.java
+++ b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/EmptyDataSetException.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/InvalidDataSetException.java b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/InvalidDataSetException.java
index 3c06416e352..7496e66db6e 100644
--- a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/InvalidDataSetException.java
+++ b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/InvalidDataSetException.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/NotImplementedException.java b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/NotImplementedException.java
index cd6843ad334..d2268fffca4 100644
--- a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/NotImplementedException.java
+++ b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/NotImplementedException.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/NotSupportedException.java b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/NotSupportedException.java
index c8ac22c5064..688fd113bf6 100644
--- a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/NotSupportedException.java
+++ b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/NotSupportedException.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterConfigurationNotFoundException.java b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterConfigurationNotFoundException.java
index 46c7c9a4e86..6e33dc2a814 100644
--- a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterConfigurationNotFoundException.java
+++ b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterConfigurationNotFoundException.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterDataAccessException.java b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterDataAccessException.java
index 605cc690a1b..759a5f322af 100644
--- a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterDataAccessException.java
+++ b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterDataAccessException.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterDataAccessorInitializationException.java b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterDataAccessorInitializationException.java
index 0aad7e8220b..05b021f88c5 100644
--- a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterDataAccessorInitializationException.java
+++ b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterDataAccessorInitializationException.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterDataAccessorNotCompatibleException.java b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterDataAccessorNotCompatibleException.java
index 6e6cc3a3f16..d9027d0b342 100644
--- a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterDataAccessorNotCompatibleException.java
+++ b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterDataAccessorNotCompatibleException.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterDataAccessorNotFoundException.java b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterDataAccessorNotFoundException.java
index a247f6fa9e1..3b40b87032e 100644
--- a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterDataAccessorNotFoundException.java
+++ b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterDataAccessorNotFoundException.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterException.java b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterException.java
index 8e5a3632419..ee4e9fa618a 100644
--- a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterException.java
+++ b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterException.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterFrameworkInitializationException.java b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterFrameworkInitializationException.java
index 9109db969b6..f3f7480c40f 100644
--- a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterFrameworkInitializationException.java
+++ b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterFrameworkInitializationException.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterFrameworkNotCompatibleException.java b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterFrameworkNotCompatibleException.java
index 784ba62e2cc..c553fd3d795 100644
--- a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterFrameworkNotCompatibleException.java
+++ b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterFrameworkNotCompatibleException.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterFrameworkNotFoundException.java b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterFrameworkNotFoundException.java
index 12470a40a3e..137ab5ab4a2 100644
--- a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterFrameworkNotFoundException.java
+++ b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterFrameworkNotFoundException.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterPrintException.java b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterPrintException.java
index 0dc4035646c..8b3a5724490 100644
--- a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterPrintException.java
+++ b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/exceptions/PlotterPrintException.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/test/PlotDataAccessTestImpl.java b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/test/PlotDataAccessTestImpl.java
index 837c1dd685e..cc95aabbcb8 100644
--- a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/test/PlotDataAccessTestImpl.java
+++ b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/test/PlotDataAccessTestImpl.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/test/PlotTestFrameStandAlone.java b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/test/PlotTestFrameStandAlone.java
index db350f065da..93991ef2453 100644
--- a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/test/PlotTestFrameStandAlone.java
+++ b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/test/PlotTestFrameStandAlone.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/JAVA/LofarUtils/src/nl/astron/lofar/lofarutils/LofarUtils.java b/JAVA/LofarUtils/src/nl/astron/lofar/lofarutils/LofarUtils.java
index 18d8fcbc8b1..fffb7ad9bd3 100644
--- a/JAVA/LofarUtils/src/nl/astron/lofar/lofarutils/LofarUtils.java
+++ b/JAVA/LofarUtils/src/nl/astron/lofar/lofarutils/LofarUtils.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/JAVA/LofarUtils/src/nl/astron/lofar/lofarutils/remoteFile.java b/JAVA/LofarUtils/src/nl/astron/lofar/lofarutils/remoteFile.java
index 7c69b46b3c9..d54a164c8cc 100644
--- a/JAVA/LofarUtils/src/nl/astron/lofar/lofarutils/remoteFile.java
+++ b/JAVA/LofarUtils/src/nl/astron/lofar/lofarutils/remoteFile.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/JAVA/LofarUtils/src/nl/astron/lofar/lofarutils/remoteFileInterface.java b/JAVA/LofarUtils/src/nl/astron/lofar/lofarutils/remoteFileInterface.java
index 9685f6a30fa..1d1d6fa861b 100644
--- a/JAVA/LofarUtils/src/nl/astron/lofar/lofarutils/remoteFileInterface.java
+++ b/JAVA/LofarUtils/src/nl/astron/lofar/lofarutils/remoteFileInterface.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/LCS/ACC/PLC/src/ProcessControl.cc b/LCS/ACC/PLC/src/ProcessControl.cc
index 9ea208bac7f..55978380f9f 100644
--- a/LCS/ACC/PLC/src/ProcessControl.cc
+++ b/LCS/ACC/PLC/src/ProcessControl.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2009
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/LCS/ACC/PLC/test/APCmdImpl.cc b/LCS/ACC/PLC/test/APCmdImpl.cc
index 52885cf9f4e..84685c1ed82 100644
--- a/LCS/ACC/PLC/test/APCmdImpl.cc
+++ b/LCS/ACC/PLC/test/APCmdImpl.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/LCS/ACC/PLC/test/APCmdImpl.h b/LCS/ACC/PLC/test/APCmdImpl.h
index bdaf177f7d4..bf4db8fc235 100644
--- a/LCS/ACC/PLC/test/APCmdImpl.h
+++ b/LCS/ACC/PLC/test/APCmdImpl.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2005
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/LCS/ACC/PLC/test/tACCmain.cc b/LCS/ACC/PLC/test/tACCmain.cc
index 8361f967b3d..0c55595a8b8 100644
--- a/LCS/ACC/PLC/test/tACCmain.cc
+++ b/LCS/ACC/PLC/test/tACCmain.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/LCS/ApplCommon/include/ApplCommon/AntField.h b/LCS/ApplCommon/include/ApplCommon/AntField.h
index 72c7c9535a6..4f53c2df6f6 100644
--- a/LCS/ApplCommon/include/ApplCommon/AntField.h
+++ b/LCS/ApplCommon/include/ApplCommon/AntField.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2010
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/LCS/ApplCommon/include/ApplCommon/AntennaSets.h b/LCS/ApplCommon/include/ApplCommon/AntennaSets.h
index 4d86f7740f9..165d99f0a3e 100644
--- a/LCS/ApplCommon/include/ApplCommon/AntennaSets.h
+++ b/LCS/ApplCommon/include/ApplCommon/AntennaSets.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2009
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/LCS/ApplCommon/include/ApplCommon/LofarDirs.h b/LCS/ApplCommon/include/ApplCommon/LofarDirs.h
index 13d80e89bac..ad9b87761f9 100644
--- a/LCS/ApplCommon/include/ApplCommon/LofarDirs.h
+++ b/LCS/ApplCommon/include/ApplCommon/LofarDirs.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/LCS/ApplCommon/src/AntField.cc b/LCS/ApplCommon/src/AntField.cc
index 9be6aed4ddc..562f4a51fcf 100644
--- a/LCS/ApplCommon/src/AntField.cc
+++ b/LCS/ApplCommon/src/AntField.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2009
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/LCS/ApplCommon/src/AntennaSets.cc b/LCS/ApplCommon/src/AntennaSets.cc
index 15327a090e6..ef443fdb6c0 100644
--- a/LCS/ApplCommon/src/AntennaSets.cc
+++ b/LCS/ApplCommon/src/AntennaSets.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2009
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/LCS/ApplCommon/test/tAntField.cc b/LCS/ApplCommon/test/tAntField.cc
index f32836169ba..1c1f63532dd 100644
--- a/LCS/ApplCommon/test/tAntField.cc
+++ b/LCS/ApplCommon/test/tAntField.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2008
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/LCS/ApplCommon/test/tAntennaSet.cc b/LCS/ApplCommon/test/tAntennaSet.cc
index 2a3da66563a..bc00c1cf560 100644
--- a/LCS/ApplCommon/test/tAntennaSet.cc
+++ b/LCS/ApplCommon/test/tAntennaSet.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2008
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/LCS/ApplCommon/test/tAntennaUse.cc b/LCS/ApplCommon/test/tAntennaUse.cc
index c5d15a69f8a..fb653665f8c 100644
--- a/LCS/ApplCommon/test/tAntennaUse.cc
+++ b/LCS/ApplCommon/test/tAntennaUse.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2008
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/LCS/Blob/src/KeyParse.yy b/LCS/Blob/src/KeyParse.yy
index 44df6720d35..89de928788f 100644
--- a/LCS/Blob/src/KeyParse.yy
+++ b/LCS/Blob/src/KeyParse.yy
@@ -3,7 +3,7 @@
 //#
 //# Copyright (C) 2004
 //# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //# This program is free software; you can redistribute it and/or modify
 //# it under the terms of the GNU General Public License as published by
diff --git a/LCS/Blob/src/KeyTokenize.ll b/LCS/Blob/src/KeyTokenize.ll
index aeb0078b0b9..c7f124c2d9b 100644
--- a/LCS/Blob/src/KeyTokenize.ll
+++ b/LCS/Blob/src/KeyTokenize.ll
@@ -3,7 +3,7 @@
 //#
 //# Copyright (C) 2004
 //# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //# This program is free software; you can redistribute it and/or modify
 //# it under the terms of the GNU General Public License as published by
diff --git a/LCS/Common/include/Common/NsTimestamp.h b/LCS/Common/include/Common/NsTimestamp.h
index 001f71770ff..775d56d653c 100644
--- a/LCS/Common/include/Common/NsTimestamp.h
+++ b/LCS/Common/include/Common/NsTimestamp.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2011
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/LCS/Common/include/Common/Thread/Cancellation.h b/LCS/Common/include/Common/Thread/Cancellation.h
index c163676d997..0f599b956c6 100644
--- a/LCS/Common/include/Common/Thread/Cancellation.h
+++ b/LCS/Common/include/Common/Thread/Cancellation.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2009
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/LCS/Common/include/Common/Thread/Condition.h b/LCS/Common/include/Common/Thread/Condition.h
index c702f4fd7d2..ca252f40c68 100644
--- a/LCS/Common/include/Common/Thread/Condition.h
+++ b/LCS/Common/include/Common/Thread/Condition.h
@@ -1,6 +1,6 @@
 //#  Copyright (C) 2009
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/LCS/Common/include/Common/Thread/Mutex.h b/LCS/Common/include/Common/Thread/Mutex.h
index b29e915db84..1b78fbda28c 100644
--- a/LCS/Common/include/Common/Thread/Mutex.h
+++ b/LCS/Common/include/Common/Thread/Mutex.h
@@ -1,6 +1,6 @@
 //#  Copyright (C) 2009
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/LCS/Common/include/Common/Thread/Queue.h b/LCS/Common/include/Common/Thread/Queue.h
index 0e3a1163856..963978a51a5 100644
--- a/LCS/Common/include/Common/Thread/Queue.h
+++ b/LCS/Common/include/Common/Thread/Queue.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/LCS/Common/include/Common/Thread/Thread.h b/LCS/Common/include/Common/Thread/Thread.h
index 4e387d56e0b..0d755db5fe3 100644
--- a/LCS/Common/include/Common/Thread/Thread.h
+++ b/LCS/Common/include/Common/Thread/Thread.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2009
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/LCS/Common/include/Common/lofar_bitset.h b/LCS/Common/include/Common/lofar_bitset.h
index adc4b891c9f..0e9c61de565 100644
--- a/LCS/Common/include/Common/lofar_bitset.h
+++ b/LCS/Common/include/Common/lofar_bitset.h
@@ -2,7 +2,7 @@
 //#
 //# Copyright (C) 2006
 //# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //# This program is free software; you can redistribute it and/or modify
 //# it under the terms of the GNU General Public License as published by
diff --git a/LCS/Common/src/NsTimestamp.cc b/LCS/Common/src/NsTimestamp.cc
index 283949c6e33..cce19bb78ff 100644
--- a/LCS/Common/src/NsTimestamp.cc
+++ b/LCS/Common/src/NsTimestamp.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/LCS/Common/src/Thread/Cancellation.cc b/LCS/Common/src/Thread/Cancellation.cc
index 3a004c9b5cb..1bbe33ac89b 100644
--- a/LCS/Common/src/Thread/Cancellation.cc
+++ b/LCS/Common/src/Thread/Cancellation.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2009
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/LCS/Common/src/Thread/Thread.cc b/LCS/Common/src/Thread/Thread.cc
index 666efe1434c..06f271e6163 100644
--- a/LCS/Common/src/Thread/Thread.cc
+++ b/LCS/Common/src/Thread/Thread.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2009
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/LCS/Common/test/tKVpair.cc b/LCS/Common/test/tKVpair.cc
index b5b7340bf1d..7127e195475 100644
--- a/LCS/Common/test/tKVpair.cc
+++ b/LCS/Common/test/tKVpair.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2011, 2014
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/LCS/Common/test/tNsTimestamp.cc b/LCS/Common/test/tNsTimestamp.cc
index 09d68bd5200..a3f767b0cf3 100644
--- a/LCS/Common/test/tNsTimestamp.cc
+++ b/LCS/Common/test/tNsTimestamp.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2011
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/LCS/Tools/src/templates/templated_header.tcc_template b/LCS/Tools/src/templates/templated_header.tcc_template
index db963f3d28f..23463cc1365 100644
--- a/LCS/Tools/src/templates/templated_header.tcc_template
+++ b/LCS/Tools/src/templates/templated_header.tcc_template
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) %YEAR%
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl 
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl 
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/APLCommon/include/APL/APLCommon/APLCommonExceptions.h b/MAC/APL/APLCommon/include/APL/APLCommon/APLCommonExceptions.h
index d6dbf7ca050..535144d265b 100644
--- a/MAC/APL/APLCommon/include/APL/APLCommon/APLCommonExceptions.h
+++ b/MAC/APL/APLCommon/include/APL/APLCommon/APLCommonExceptions.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2005
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/APLCommon/include/APL/APLCommon/APLUtilities.h b/MAC/APL/APLCommon/include/APL/APLCommon/APLUtilities.h
index 765a5b70949..076db645b2d 100644
--- a/MAC/APL/APLCommon/include/APL/APLCommon/APLUtilities.h
+++ b/MAC/APL/APLCommon/include/APL/APLCommon/APLUtilities.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/APLCommon/include/APL/APLCommon/APL_Defines.h b/MAC/APL/APLCommon/include/APL/APLCommon/APL_Defines.h
index 910fe09c3d9..f85d6914131 100644
--- a/MAC/APL/APLCommon/include/APL/APLCommon/APL_Defines.h
+++ b/MAC/APL/APLCommon/include/APL/APLCommon/APL_Defines.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/APLCommon/include/APL/APLCommon/AntennaField.h b/MAC/APL/APLCommon/include/APL/APLCommon/AntennaField.h
index ba70076c90e..2fab4f68c1e 100644
--- a/MAC/APL/APLCommon/include/APL/APLCommon/AntennaField.h
+++ b/MAC/APL/APLCommon/include/APL/APLCommon/AntennaField.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2010
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/APLCommon/include/APL/APLCommon/AntennaMapper.h b/MAC/APL/APLCommon/include/APL/APLCommon/AntennaMapper.h
index 9d77ed57227..67c5d17fea0 100644
--- a/MAC/APL/APLCommon/include/APL/APLCommon/AntennaMapper.h
+++ b/MAC/APL/APLCommon/include/APL/APLCommon/AntennaMapper.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2008
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/APLCommon/include/APL/APLCommon/CTState.h b/MAC/APL/APLCommon/include/APL/APLCommon/CTState.h
index 64ca1ccb534..47bec1cffc2 100644
--- a/MAC/APL/APLCommon/include/APL/APLCommon/CTState.h
+++ b/MAC/APL/APLCommon/include/APL/APLCommon/CTState.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/APLCommon/include/APL/APLCommon/ChildControl.h b/MAC/APL/APLCommon/include/APL/APLCommon/ChildControl.h
index 4097bae1b42..136406a8247 100644
--- a/MAC/APL/APLCommon/include/APL/APLCommon/ChildControl.h
+++ b/MAC/APL/APLCommon/include/APL/APLCommon/ChildControl.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/APLCommon/include/APL/APLCommon/ControllerAdmin.h b/MAC/APL/APLCommon/include/APL/APLCommon/ControllerAdmin.h
index a70bb622f69..ff7683756f2 100644
--- a/MAC/APL/APLCommon/include/APL/APLCommon/ControllerAdmin.h
+++ b/MAC/APL/APLCommon/include/APL/APLCommon/ControllerAdmin.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/APLCommon/include/APL/APLCommon/ControllerDefines.h b/MAC/APL/APLCommon/include/APL/APLCommon/ControllerDefines.h
index 04352c5fed3..d1e3c45a1ad 100644
--- a/MAC/APL/APLCommon/include/APL/APLCommon/ControllerDefines.h
+++ b/MAC/APL/APLCommon/include/APL/APLCommon/ControllerDefines.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/APLCommon/include/APL/APLCommon/ControllerInfo.h b/MAC/APL/APLCommon/include/APL/APLCommon/ControllerInfo.h
index 97d012f8671..a578f90e04e 100644
--- a/MAC/APL/APLCommon/include/APL/APLCommon/ControllerInfo.h
+++ b/MAC/APL/APLCommon/include/APL/APLCommon/ControllerInfo.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/APLCommon/include/APL/APLCommon/ParentControl.h b/MAC/APL/APLCommon/include/APL/APLCommon/ParentControl.h
index 06cadb000f2..c705cd92fed 100644
--- a/MAC/APL/APLCommon/include/APL/APLCommon/ParentControl.h
+++ b/MAC/APL/APLCommon/include/APL/APLCommon/ParentControl.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/APLCommon/include/APL/APLCommon/bitsetUtil.tcc b/MAC/APL/APLCommon/include/APL/APLCommon/bitsetUtil.tcc
index b7126e507f2..df3a58917e0 100644
--- a/MAC/APL/APLCommon/include/APL/APLCommon/bitsetUtil.tcc
+++ b/MAC/APL/APLCommon/include/APL/APLCommon/bitsetUtil.tcc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2008
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/APLCommon/src/APLUtilities.cc b/MAC/APL/APLCommon/src/APLUtilities.cc
index f3c44835a1a..5e408cb3da8 100644
--- a/MAC/APL/APLCommon/src/APLUtilities.cc
+++ b/MAC/APL/APLCommon/src/APLUtilities.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/APLCommon/src/AntennaField.cc b/MAC/APL/APLCommon/src/AntennaField.cc
index 645fd708e93..833b869488f 100644
--- a/MAC/APL/APLCommon/src/AntennaField.cc
+++ b/MAC/APL/APLCommon/src/AntennaField.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2009
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/APLCommon/src/CTState.cc b/MAC/APL/APLCommon/src/CTState.cc
index 7f1b4de35a2..c6dc2b8d5ab 100644
--- a/MAC/APL/APLCommon/src/CTState.cc
+++ b/MAC/APL/APLCommon/src/CTState.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/APLCommon/src/ChildControl.cc b/MAC/APL/APLCommon/src/ChildControl.cc
index 9a0ef06279c..b3d330652d9 100644
--- a/MAC/APL/APLCommon/src/ChildControl.cc
+++ b/MAC/APL/APLCommon/src/ChildControl.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/APLCommon/src/ControllerAdmin.cc b/MAC/APL/APLCommon/src/ControllerAdmin.cc
index 513166c276b..f2d45ad8925 100644
--- a/MAC/APL/APLCommon/src/ControllerAdmin.cc
+++ b/MAC/APL/APLCommon/src/ControllerAdmin.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/APLCommon/src/ControllerDefines.cc b/MAC/APL/APLCommon/src/ControllerDefines.cc
index ba80f725ad8..6556607eb99 100644
--- a/MAC/APL/APLCommon/src/ControllerDefines.cc
+++ b/MAC/APL/APLCommon/src/ControllerDefines.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006-2008
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/APLCommon/src/Controller_Protocol.prot b/MAC/APL/APLCommon/src/Controller_Protocol.prot
index 2c5f017da87..b2dd9d3a447 100644
--- a/MAC/APL/APLCommon/src/Controller_Protocol.prot
+++ b/MAC/APL/APLCommon/src/Controller_Protocol.prot
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/APLCommon/src/ParentControl.cc b/MAC/APL/APLCommon/src/ParentControl.cc
index 9c947429962..9d93ec87c22 100644
--- a/MAC/APL/APLCommon/src/ParentControl.cc
+++ b/MAC/APL/APLCommon/src/ParentControl.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/APLCommon/src/StartDaemon_Protocol.prot b/MAC/APL/APLCommon/src/StartDaemon_Protocol.prot
index 18da4c7d80f..42cd1000960 100644
--- a/MAC/APL/APLCommon/src/StartDaemon_Protocol.prot
+++ b/MAC/APL/APLCommon/src/StartDaemon_Protocol.prot
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2005
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/APLCommon/src/swlevel b/MAC/APL/APLCommon/src/swlevel
index 442473c4a9d..7d02ef09123 100644
--- a/MAC/APL/APLCommon/src/swlevel
+++ b/MAC/APL/APLCommon/src/swlevel
@@ -4,7 +4,7 @@
 #
 # Copyright (C) 2006
 # ASTRON (Netherlands Foundation for Research in Astronomy)
-# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/APLCommon/test/ControllerProtMenu.cc b/MAC/APL/APLCommon/test/ControllerProtMenu.cc
index 347b7b34adb..7700f4411da 100644
--- a/MAC/APL/APLCommon/test/ControllerProtMenu.cc
+++ b/MAC/APL/APLCommon/test/ControllerProtMenu.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/APLCommon/test/ControllerProtMenu.h b/MAC/APL/APLCommon/test/ControllerProtMenu.h
index 7d846eb9ebc..741e9fcb20c 100644
--- a/MAC/APL/APLCommon/test/ControllerProtMenu.h
+++ b/MAC/APL/APLCommon/test/ControllerProtMenu.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/APLCommon/test/tAPLUtilities.cc b/MAC/APL/APLCommon/test/tAPLUtilities.cc
index c7549a16240..224f68e2b4d 100644
--- a/MAC/APL/APLCommon/test/tAPLUtilities.cc
+++ b/MAC/APL/APLCommon/test/tAPLUtilities.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/APLCommon/test/tAntennaField.cc b/MAC/APL/APLCommon/test/tAntennaField.cc
index db80c0572c2..da96240a2b2 100644
--- a/MAC/APL/APLCommon/test/tAntennaField.cc
+++ b/MAC/APL/APLCommon/test/tAntennaField.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2008
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/APLCommon/test/tAntennaMapper.cc b/MAC/APL/APLCommon/test/tAntennaMapper.cc
index ad3ffee403a..68a7efaffdc 100644
--- a/MAC/APL/APLCommon/test/tAntennaMapper.cc
+++ b/MAC/APL/APLCommon/test/tAntennaMapper.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2008
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/APLCommon/test/tControllerDefines.cc b/MAC/APL/APLCommon/test/tControllerDefines.cc
index d4de4389af3..6ee21eaf436 100644
--- a/MAC/APL/APLCommon/test/tControllerDefines.cc
+++ b/MAC/APL/APLCommon/test/tControllerDefines.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/APLCommon/test/tOutOfBand.cc b/MAC/APL/APLCommon/test/tOutOfBand.cc
index 1564f1afd09..03c5bf292c9 100644
--- a/MAC/APL/APLCommon/test/tOutOfBand.cc
+++ b/MAC/APL/APLCommon/test/tOutOfBand.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/APLCommon/test/tParentControl.cc b/MAC/APL/APLCommon/test/tParentControl.cc
index b5e8b1f343d..9ba05f7c661 100644
--- a/MAC/APL/APLCommon/test/tParentControl.cc
+++ b/MAC/APL/APLCommon/test/tParentControl.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2011
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/APLCommon/test/tParentControl.h b/MAC/APL/APLCommon/test/tParentControl.h
index 1a0c24ae059..dfa5b432ebe 100644
--- a/MAC/APL/APLCommon/test/tParentControl.h
+++ b/MAC/APL/APLCommon/test/tParentControl.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2010-2011
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/APLCommon/test/tbitsetUtil.cc b/MAC/APL/APLCommon/test/tbitsetUtil.cc
index 1550d0a9c86..12016ad480f 100644
--- a/MAC/APL/APLCommon/test/tbitsetUtil.cc
+++ b/MAC/APL/APLCommon/test/tbitsetUtil.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2008
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/ACCmdImpl.cc b/MAC/APL/Appl_Controller/src/ACCmdImpl.cc
index ac5dac98d8b..ffdbf897188 100644
--- a/MAC/APL/Appl_Controller/src/ACCmdImpl.cc
+++ b/MAC/APL/Appl_Controller/src/ACCmdImpl.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/ACCmdImpl.h b/MAC/APL/Appl_Controller/src/ACCmdImpl.h
index 45c707a3aee..770751e70e3 100644
--- a/MAC/APL/Appl_Controller/src/ACCmdImpl.h
+++ b/MAC/APL/Appl_Controller/src/ACCmdImpl.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/ACDaemon.cc b/MAC/APL/Appl_Controller/src/ACDaemon.cc
index 341312a8569..478489607e4 100644
--- a/MAC/APL/Appl_Controller/src/ACDaemon.cc
+++ b/MAC/APL/Appl_Controller/src/ACDaemon.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/ACDaemon.h b/MAC/APL/Appl_Controller/src/ACDaemon.h
index a84c6777b6d..d68f57ffe95 100644
--- a/MAC/APL/Appl_Controller/src/ACDaemon.h
+++ b/MAC/APL/Appl_Controller/src/ACDaemon.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2005
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/ACDaemonComm.cc b/MAC/APL/Appl_Controller/src/ACDaemonComm.cc
index 41e8a8e9cac..749cd700b1d 100644
--- a/MAC/APL/Appl_Controller/src/ACDaemonComm.cc
+++ b/MAC/APL/Appl_Controller/src/ACDaemonComm.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2005
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/ACDaemonComm.h b/MAC/APL/Appl_Controller/src/ACDaemonComm.h
index 9cd482827b1..7bb1b0ef5bd 100644
--- a/MAC/APL/Appl_Controller/src/ACDaemonComm.h
+++ b/MAC/APL/Appl_Controller/src/ACDaemonComm.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/ACDaemonMain.cc b/MAC/APL/Appl_Controller/src/ACDaemonMain.cc
index 998e308fc81..a236d79fbea 100644
--- a/MAC/APL/Appl_Controller/src/ACDaemonMain.cc
+++ b/MAC/APL/Appl_Controller/src/ACDaemonMain.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2005
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/ACRequestPool.cc b/MAC/APL/Appl_Controller/src/ACRequestPool.cc
index db0f73a09c6..4a835cb8be9 100644
--- a/MAC/APL/Appl_Controller/src/ACRequestPool.cc
+++ b/MAC/APL/Appl_Controller/src/ACRequestPool.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/ACRequestPool.h b/MAC/APL/Appl_Controller/src/ACRequestPool.h
index 435680c6d52..a256fe50242 100644
--- a/MAC/APL/Appl_Controller/src/ACRequestPool.h
+++ b/MAC/APL/Appl_Controller/src/ACRequestPool.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/ACcli.cc b/MAC/APL/Appl_Controller/src/ACcli.cc
index dfcf191d466..cbd5456571f 100644
--- a/MAC/APL/Appl_Controller/src/ACcli.cc
+++ b/MAC/APL/Appl_Controller/src/ACcli.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/ACuserMenu.cc b/MAC/APL/Appl_Controller/src/ACuserMenu.cc
index 434111e61c1..f4a24a953d8 100644
--- a/MAC/APL/Appl_Controller/src/ACuserMenu.cc
+++ b/MAC/APL/Appl_Controller/src/ACuserMenu.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2004-2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/APAdmin.cc b/MAC/APL/Appl_Controller/src/APAdmin.cc
index 7aab806a002..c4be1d6a156 100644
--- a/MAC/APL/Appl_Controller/src/APAdmin.cc
+++ b/MAC/APL/Appl_Controller/src/APAdmin.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/APAdmin.h b/MAC/APL/Appl_Controller/src/APAdmin.h
index 21de52204f9..6605c3a02ba 100644
--- a/MAC/APL/Appl_Controller/src/APAdmin.h
+++ b/MAC/APL/Appl_Controller/src/APAdmin.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/APAdminPool.cc b/MAC/APL/Appl_Controller/src/APAdminPool.cc
index 7d44a541da4..860e767ec59 100644
--- a/MAC/APL/Appl_Controller/src/APAdminPool.cc
+++ b/MAC/APL/Appl_Controller/src/APAdminPool.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/APAdminPool.h b/MAC/APL/Appl_Controller/src/APAdminPool.h
index 109e36f805e..0035bf8498d 100644
--- a/MAC/APL/Appl_Controller/src/APAdminPool.h
+++ b/MAC/APL/Appl_Controller/src/APAdminPool.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/ApplController.cc b/MAC/APL/Appl_Controller/src/ApplController.cc
index e8a705370b1..3714a5d575f 100644
--- a/MAC/APL/Appl_Controller/src/ApplController.cc
+++ b/MAC/APL/Appl_Controller/src/ApplController.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/ApplController.h b/MAC/APL/Appl_Controller/src/ApplController.h
index a8a63fa87ad..8ed816cfbf1 100644
--- a/MAC/APL/Appl_Controller/src/ApplController.h
+++ b/MAC/APL/Appl_Controller/src/ApplController.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/ApplControllerMain.cc b/MAC/APL/Appl_Controller/src/ApplControllerMain.cc
index 2dfc8e7fcc2..f181bc16bf1 100644
--- a/MAC/APL/Appl_Controller/src/ApplControllerMain.cc
+++ b/MAC/APL/Appl_Controller/src/ApplControllerMain.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/CmdStack.cc b/MAC/APL/Appl_Controller/src/CmdStack.cc
index daea49c2885..02ea31a453d 100644
--- a/MAC/APL/Appl_Controller/src/CmdStack.cc
+++ b/MAC/APL/Appl_Controller/src/CmdStack.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/CmdStack.h b/MAC/APL/Appl_Controller/src/CmdStack.h
index 3e6b0451c90..111a97116c3 100644
--- a/MAC/APL/Appl_Controller/src/CmdStack.h
+++ b/MAC/APL/Appl_Controller/src/CmdStack.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/ItemList.cc b/MAC/APL/Appl_Controller/src/ItemList.cc
index 91e324e5889..2182516b871 100644
--- a/MAC/APL/Appl_Controller/src/ItemList.cc
+++ b/MAC/APL/Appl_Controller/src/ItemList.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/ItemList.h b/MAC/APL/Appl_Controller/src/ItemList.h
index 590ce6d9923..d98296f6cee 100644
--- a/MAC/APL/Appl_Controller/src/ItemList.h
+++ b/MAC/APL/Appl_Controller/src/ItemList.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/PR_BGL.cc b/MAC/APL/Appl_Controller/src/PR_BGL.cc
index 3530170128a..7294642c0f0 100644
--- a/MAC/APL/Appl_Controller/src/PR_BGL.cc
+++ b/MAC/APL/Appl_Controller/src/PR_BGL.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/PR_BGL.h b/MAC/APL/Appl_Controller/src/PR_BGL.h
index 15c8354686a..081cb8b9d05 100644
--- a/MAC/APL/Appl_Controller/src/PR_BGL.h
+++ b/MAC/APL/Appl_Controller/src/PR_BGL.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/PR_MPI.cc b/MAC/APL/Appl_Controller/src/PR_MPI.cc
index be17281808e..041622e79c6 100644
--- a/MAC/APL/Appl_Controller/src/PR_MPI.cc
+++ b/MAC/APL/Appl_Controller/src/PR_MPI.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/PR_MPI.h b/MAC/APL/Appl_Controller/src/PR_MPI.h
index 9dbe531055e..d1f699dca29 100644
--- a/MAC/APL/Appl_Controller/src/PR_MPI.h
+++ b/MAC/APL/Appl_Controller/src/PR_MPI.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/PR_Shell.cc b/MAC/APL/Appl_Controller/src/PR_Shell.cc
index 57f9e26f3e6..a61566fbc46 100644
--- a/MAC/APL/Appl_Controller/src/PR_Shell.cc
+++ b/MAC/APL/Appl_Controller/src/PR_Shell.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/PR_Shell.h b/MAC/APL/Appl_Controller/src/PR_Shell.h
index dcad3f08d42..44d7f989f1d 100644
--- a/MAC/APL/Appl_Controller/src/PR_Shell.h
+++ b/MAC/APL/Appl_Controller/src/PR_Shell.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/ProcRule.cc b/MAC/APL/Appl_Controller/src/ProcRule.cc
index 60feaa63aed..5453acaa19b 100644
--- a/MAC/APL/Appl_Controller/src/ProcRule.cc
+++ b/MAC/APL/Appl_Controller/src/ProcRule.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/ProcRule.h b/MAC/APL/Appl_Controller/src/ProcRule.h
index 321fe545686..880b5d25d79 100644
--- a/MAC/APL/Appl_Controller/src/ProcRule.h
+++ b/MAC/APL/Appl_Controller/src/ProcRule.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/ProcRuler.cc b/MAC/APL/Appl_Controller/src/ProcRuler.cc
index b0a68008a86..df77b2f0ea9 100644
--- a/MAC/APL/Appl_Controller/src/ProcRuler.cc
+++ b/MAC/APL/Appl_Controller/src/ProcRuler.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/ProcRuler.h b/MAC/APL/Appl_Controller/src/ProcRuler.h
index a1450fdcfba..55f2231c869 100644
--- a/MAC/APL/Appl_Controller/src/ProcRuler.h
+++ b/MAC/APL/Appl_Controller/src/ProcRuler.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/StateEngine.cc b/MAC/APL/Appl_Controller/src/StateEngine.cc
index 9dd434f59aa..399df055032 100644
--- a/MAC/APL/Appl_Controller/src/StateEngine.cc
+++ b/MAC/APL/Appl_Controller/src/StateEngine.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/StateEngine.h b/MAC/APL/Appl_Controller/src/StateEngine.h
index 8860093af67..66b50d0414b 100644
--- a/MAC/APL/Appl_Controller/src/StateEngine.h
+++ b/MAC/APL/Appl_Controller/src/StateEngine.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/forkexec.cc b/MAC/APL/Appl_Controller/src/forkexec.cc
index f026d94efea..d62fee2a01f 100644
--- a/MAC/APL/Appl_Controller/src/forkexec.cc
+++ b/MAC/APL/Appl_Controller/src/forkexec.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/forkexec.h b/MAC/APL/Appl_Controller/src/forkexec.h
index 6c14b23d176..c5951cee44a 100644
--- a/MAC/APL/Appl_Controller/src/forkexec.h
+++ b/MAC/APL/Appl_Controller/src/forkexec.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Appl_Controller/src/myACClientFunctions.h b/MAC/APL/Appl_Controller/src/myACClientFunctions.h
index d0e23661822..5645adeeea7 100644
--- a/MAC/APL/Appl_Controller/src/myACClientFunctions.h
+++ b/MAC/APL/Appl_Controller/src/myACClientFunctions.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CASATools/include/CASATools/CasaConverter.h b/MAC/APL/CASATools/include/CASATools/CasaConverter.h
index e8d85d7201c..1e53f575cb1 100644
--- a/MAC/APL/CASATools/include/CASATools/CasaConverter.h
+++ b/MAC/APL/CASATools/include/CASATools/CasaConverter.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2010
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CASATools/src/CasaConverter.cc b/MAC/APL/CASATools/src/CasaConverter.cc
index 0998eaf49bf..bd9311d24d3 100644
--- a/MAC/APL/CASATools/src/CasaConverter.cc
+++ b/MAC/APL/CASATools/src/CasaConverter.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2010
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CASATools/test/tCasaConverter.cc b/MAC/APL/CASATools/test/tCasaConverter.cc
index 42f6345f3d4..aed0bc66236 100644
--- a/MAC/APL/CASATools/test/tCasaConverter.cc
+++ b/MAC/APL/CASATools/test/tCasaConverter.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2010
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CEPCU/src/CEPHardwareMonitor/BlueGeneMonitor.cc b/MAC/APL/CEPCU/src/CEPHardwareMonitor/BlueGeneMonitor.cc
index c37e4133906..169a1496c39 100644
--- a/MAC/APL/CEPCU/src/CEPHardwareMonitor/BlueGeneMonitor.cc
+++ b/MAC/APL/CEPCU/src/CEPHardwareMonitor/BlueGeneMonitor.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2011
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CEPCU/src/CEPHardwareMonitor/BlueGeneMonitor.h b/MAC/APL/CEPCU/src/CEPHardwareMonitor/BlueGeneMonitor.h
index 5567484edea..5f0ccae0a72 100644
--- a/MAC/APL/CEPCU/src/CEPHardwareMonitor/BlueGeneMonitor.h
+++ b/MAC/APL/CEPCU/src/CEPHardwareMonitor/BlueGeneMonitor.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CEPCU/src/CEPHardwareMonitor/CEPHardwareMonitorMain.cc b/MAC/APL/CEPCU/src/CEPHardwareMonitor/CEPHardwareMonitorMain.cc
index 964b86e947c..74c00fdce20 100644
--- a/MAC/APL/CEPCU/src/CEPHardwareMonitor/CEPHardwareMonitorMain.cc
+++ b/MAC/APL/CEPCU/src/CEPHardwareMonitor/CEPHardwareMonitorMain.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2011
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CEPCU/src/CEPHardwareMonitor/ClusterMonitor.cc b/MAC/APL/CEPCU/src/CEPHardwareMonitor/ClusterMonitor.cc
index 3df9e8519bb..3395dc59d32 100644
--- a/MAC/APL/CEPCU/src/CEPHardwareMonitor/ClusterMonitor.cc
+++ b/MAC/APL/CEPCU/src/CEPHardwareMonitor/ClusterMonitor.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2011
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CEPCU/src/CEPHardwareMonitor/ClusterMonitor.h b/MAC/APL/CEPCU/src/CEPHardwareMonitor/ClusterMonitor.h
index f4f91f07af9..f7435451013 100644
--- a/MAC/APL/CEPCU/src/CEPHardwareMonitor/ClusterMonitor.h
+++ b/MAC/APL/CEPCU/src/CEPHardwareMonitor/ClusterMonitor.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CEPCU/src/OnlineControl/OnlineControl.cc b/MAC/APL/CEPCU/src/OnlineControl/OnlineControl.cc
index 8127b683a13..8fd5d8e1b2f 100644
--- a/MAC/APL/CEPCU/src/OnlineControl/OnlineControl.cc
+++ b/MAC/APL/CEPCU/src/OnlineControl/OnlineControl.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CEPCU/src/OnlineControl/OnlineControl.h b/MAC/APL/CEPCU/src/OnlineControl/OnlineControl.h
index 3fda39dc026..a3fe3a4fc85 100644
--- a/MAC/APL/CEPCU/src/OnlineControl/OnlineControl.h
+++ b/MAC/APL/CEPCU/src/OnlineControl/OnlineControl.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CEPCU/src/OnlineControl/OnlineControlDefines.h b/MAC/APL/CEPCU/src/OnlineControl/OnlineControlDefines.h
index d1e91e7af93..443d1365374 100644
--- a/MAC/APL/CEPCU/src/OnlineControl/OnlineControlDefines.h
+++ b/MAC/APL/CEPCU/src/OnlineControl/OnlineControlDefines.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CEPCU/src/OnlineControl/OnlineControlMain.cc b/MAC/APL/CEPCU/src/OnlineControl/OnlineControlMain.cc
index 1a0dadbfb11..e3356ed0143 100644
--- a/MAC/APL/CEPCU/src/OnlineControl/OnlineControlMain.cc
+++ b/MAC/APL/CEPCU/src/OnlineControl/OnlineControlMain.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CEPCU/src/OnlineControl/Response.cc b/MAC/APL/CEPCU/src/OnlineControl/Response.cc
index c49b50d2f45..6ee31797ebd 100644
--- a/MAC/APL/CEPCU/src/OnlineControl/Response.cc
+++ b/MAC/APL/CEPCU/src/OnlineControl/Response.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006-2012
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CEPCU/src/OnlineControl/Response.h b/MAC/APL/CEPCU/src/OnlineControl/Response.h
index 364f9879717..9885b5befeb 100644
--- a/MAC/APL/CEPCU/src/OnlineControl/Response.h
+++ b/MAC/APL/CEPCU/src/OnlineControl/Response.h
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2003-2012
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CEPCU/src/OnlineControl/forkexec.cc b/MAC/APL/CEPCU/src/OnlineControl/forkexec.cc
index 533fb28fb79..60dcccc53df 100644
--- a/MAC/APL/CEPCU/src/OnlineControl/forkexec.cc
+++ b/MAC/APL/CEPCU/src/OnlineControl/forkexec.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CEPCU/src/OnlineControl/forkexec.h b/MAC/APL/CEPCU/src/OnlineControl/forkexec.h
index 65a1a59f416..baa92e8e42e 100644
--- a/MAC/APL/CEPCU/src/OnlineControl/forkexec.h
+++ b/MAC/APL/CEPCU/src/OnlineControl/forkexec.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CEPCU/src/OnlineControl/tPVSSMapping.cc b/MAC/APL/CEPCU/src/OnlineControl/tPVSSMapping.cc
index a1d6039e885..7f78e9eb339 100644
--- a/MAC/APL/CEPCU/src/OnlineControl/tPVSSMapping.cc
+++ b/MAC/APL/CEPCU/src/OnlineControl/tPVSSMapping.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CEPCU/src/PythonControl/CMakeLists.txt b/MAC/APL/CEPCU/src/PythonControl/CMakeLists.txt
index 6ad8270b539..c2b65109e68 100644
--- a/MAC/APL/CEPCU/src/PythonControl/CMakeLists.txt
+++ b/MAC/APL/CEPCU/src/PythonControl/CMakeLists.txt
@@ -2,7 +2,7 @@
 #
 #  Copyright (C) 2008-2009
 #  ASTRON (Netherlands Foundation for Research in Astronomy)
-#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CEPCU/src/PythonControl/PythonControl.cc b/MAC/APL/CEPCU/src/PythonControl/PythonControl.cc
index 3a699e0eb2e..3bd66084edb 100644
--- a/MAC/APL/CEPCU/src/PythonControl/PythonControl.cc
+++ b/MAC/APL/CEPCU/src/PythonControl/PythonControl.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2010-2012
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CEPCU/src/PythonControl/PythonControl.h b/MAC/APL/CEPCU/src/PythonControl/PythonControl.h
index 25322035335..7d3460d2382 100644
--- a/MAC/APL/CEPCU/src/PythonControl/PythonControl.h
+++ b/MAC/APL/CEPCU/src/PythonControl/PythonControl.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CEPCU/src/PythonControl/PythonControlDefines.h b/MAC/APL/CEPCU/src/PythonControl/PythonControlDefines.h
index b6e619b415a..ae143bf6efc 100644
--- a/MAC/APL/CEPCU/src/PythonControl/PythonControlDefines.h
+++ b/MAC/APL/CEPCU/src/PythonControl/PythonControlDefines.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CEPCU/src/PythonControl/PythonControlMain.cc b/MAC/APL/CEPCU/src/PythonControl/PythonControlMain.cc
index ce740989d1e..565ab9bd97f 100644
--- a/MAC/APL/CEPCU/src/PythonControl/PythonControlMain.cc
+++ b/MAC/APL/CEPCU/src/PythonControl/PythonControlMain.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CEPCU/src/PythonControl/uploadMetadata.cc b/MAC/APL/CEPCU/src/PythonControl/uploadMetadata.cc
index 998ffd78823..c7a81c707de 100644
--- a/MAC/APL/CEPCU/src/PythonControl/uploadMetadata.cc
+++ b/MAC/APL/CEPCU/src/PythonControl/uploadMetadata.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2010-2012
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CEPCU/src/_OfflineControl/CEPApplicationManager.cc b/MAC/APL/CEPCU/src/_OfflineControl/CEPApplicationManager.cc
index c936548d6ae..0756be5111f 100644
--- a/MAC/APL/CEPCU/src/_OfflineControl/CEPApplicationManager.cc
+++ b/MAC/APL/CEPCU/src/_OfflineControl/CEPApplicationManager.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CEPCU/src/_OfflineControl/CEPApplicationManager.h b/MAC/APL/CEPCU/src/_OfflineControl/CEPApplicationManager.h
index 583db074da7..c8e7b8eddce 100644
--- a/MAC/APL/CEPCU/src/_OfflineControl/CEPApplicationManager.h
+++ b/MAC/APL/CEPCU/src/_OfflineControl/CEPApplicationManager.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2005
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CEPCU/src/_OfflineControl/OfflineControl.cc b/MAC/APL/CEPCU/src/_OfflineControl/OfflineControl.cc
index 2a624c31c01..e41b6e7fae0 100644
--- a/MAC/APL/CEPCU/src/_OfflineControl/OfflineControl.cc
+++ b/MAC/APL/CEPCU/src/_OfflineControl/OfflineControl.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CEPCU/src/_OfflineControl/OfflineControl.h b/MAC/APL/CEPCU/src/_OfflineControl/OfflineControl.h
index 1a5ce55f7d3..97002d7f870 100644
--- a/MAC/APL/CEPCU/src/_OfflineControl/OfflineControl.h
+++ b/MAC/APL/CEPCU/src/_OfflineControl/OfflineControl.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CEPCU/src/_OfflineControl/OfflineControlDefines.h b/MAC/APL/CEPCU/src/_OfflineControl/OfflineControlDefines.h
index 1817a4fe5d7..41af2293fca 100644
--- a/MAC/APL/CEPCU/src/_OfflineControl/OfflineControlDefines.h
+++ b/MAC/APL/CEPCU/src/_OfflineControl/OfflineControlDefines.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CEPCU/src/_OfflineControl/OfflineControlMain.cc b/MAC/APL/CEPCU/src/_OfflineControl/OfflineControlMain.cc
index f827d1fedfb..5d51ba9e98d 100644
--- a/MAC/APL/CEPCU/src/_OfflineControl/OfflineControlMain.cc
+++ b/MAC/APL/CEPCU/src/_OfflineControl/OfflineControlMain.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CR_Protocol/include/APL/CR_Protocol/CRreadRequest.h b/MAC/APL/CR_Protocol/include/APL/CR_Protocol/CRreadRequest.h
index dd0d423131d..52c2306b383 100644
--- a/MAC/APL/CR_Protocol/include/APL/CR_Protocol/CRreadRequest.h
+++ b/MAC/APL/CR_Protocol/include/APL/CR_Protocol/CRreadRequest.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2011
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CR_Protocol/include/APL/CR_Protocol/CRreadVector.h b/MAC/APL/CR_Protocol/include/APL/CR_Protocol/CRreadVector.h
index 0e082b4ea21..cd24ed217b8 100644
--- a/MAC/APL/CR_Protocol/include/APL/CR_Protocol/CRreadVector.h
+++ b/MAC/APL/CR_Protocol/include/APL/CR_Protocol/CRreadVector.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2011
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CR_Protocol/include/APL/CR_Protocol/CRrecordRequest.h b/MAC/APL/CR_Protocol/include/APL/CR_Protocol/CRrecordRequest.h
index fff06e28b2c..0f6915ad4c7 100644
--- a/MAC/APL/CR_Protocol/include/APL/CR_Protocol/CRrecordRequest.h
+++ b/MAC/APL/CR_Protocol/include/APL/CR_Protocol/CRrecordRequest.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2011
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CR_Protocol/include/APL/CR_Protocol/CRrecordVector.h b/MAC/APL/CR_Protocol/include/APL/CR_Protocol/CRrecordVector.h
index 60b4ac5cb52..d851af6fb25 100644
--- a/MAC/APL/CR_Protocol/include/APL/CR_Protocol/CRrecordVector.h
+++ b/MAC/APL/CR_Protocol/include/APL/CR_Protocol/CRrecordVector.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2011
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CR_Protocol/include/APL/CR_Protocol/CRstopRequest.h b/MAC/APL/CR_Protocol/include/APL/CR_Protocol/CRstopRequest.h
index 11e113e7a8c..c8705be5313 100644
--- a/MAC/APL/CR_Protocol/include/APL/CR_Protocol/CRstopRequest.h
+++ b/MAC/APL/CR_Protocol/include/APL/CR_Protocol/CRstopRequest.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2011
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CR_Protocol/include/APL/CR_Protocol/CRstopVector.h b/MAC/APL/CR_Protocol/include/APL/CR_Protocol/CRstopVector.h
index 355a4d1e340..43b1c9a34f1 100644
--- a/MAC/APL/CR_Protocol/include/APL/CR_Protocol/CRstopVector.h
+++ b/MAC/APL/CR_Protocol/include/APL/CR_Protocol/CRstopVector.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2011
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CR_Protocol/src/CRreadRequest.cc b/MAC/APL/CR_Protocol/src/CRreadRequest.cc
index 074924bc908..064c869e5a8 100644
--- a/MAC/APL/CR_Protocol/src/CRreadRequest.cc
+++ b/MAC/APL/CR_Protocol/src/CRreadRequest.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2011
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CR_Protocol/src/CRreadVector.cc b/MAC/APL/CR_Protocol/src/CRreadVector.cc
index a06f45e152c..da8efa38a63 100644
--- a/MAC/APL/CR_Protocol/src/CRreadVector.cc
+++ b/MAC/APL/CR_Protocol/src/CRreadVector.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2011
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CR_Protocol/src/CRrecordRequest.cc b/MAC/APL/CR_Protocol/src/CRrecordRequest.cc
index ad1308435b2..054481e2303 100644
--- a/MAC/APL/CR_Protocol/src/CRrecordRequest.cc
+++ b/MAC/APL/CR_Protocol/src/CRrecordRequest.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2011
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CR_Protocol/src/CRrecordVector.cc b/MAC/APL/CR_Protocol/src/CRrecordVector.cc
index e9423146f8f..a8d944abf52 100644
--- a/MAC/APL/CR_Protocol/src/CRrecordVector.cc
+++ b/MAC/APL/CR_Protocol/src/CRrecordVector.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2011
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CR_Protocol/src/CRstopRequest.cc b/MAC/APL/CR_Protocol/src/CRstopRequest.cc
index 20f88741212..1e76a486852 100644
--- a/MAC/APL/CR_Protocol/src/CRstopRequest.cc
+++ b/MAC/APL/CR_Protocol/src/CRstopRequest.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2011
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CR_Protocol/src/CRstopVector.cc b/MAC/APL/CR_Protocol/src/CRstopVector.cc
index 1cd817a7a73..2686ca88e50 100644
--- a/MAC/APL/CR_Protocol/src/CRstopVector.cc
+++ b/MAC/APL/CR_Protocol/src/CRstopVector.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2011
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CR_Protocol/test/tCR_Protocol.cc b/MAC/APL/CR_Protocol/test/tCR_Protocol.cc
index db8358dd462..5afda5f3343 100644
--- a/MAC/APL/CR_Protocol/test/tCR_Protocol.cc
+++ b/MAC/APL/CR_Protocol/test/tCR_Protocol.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2011
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CUDaemons/CT_StartDaemon/CTStartDaemon.cc b/MAC/APL/CUDaemons/CT_StartDaemon/CTStartDaemon.cc
index da1c15c822f..b1103e70473 100644
--- a/MAC/APL/CUDaemons/CT_StartDaemon/CTStartDaemon.cc
+++ b/MAC/APL/CUDaemons/CT_StartDaemon/CTStartDaemon.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CUDaemons/CT_StartDaemon/CTStartDaemon.h b/MAC/APL/CUDaemons/CT_StartDaemon/CTStartDaemon.h
index 4df6adb0073..4a3346cd22e 100644
--- a/MAC/APL/CUDaemons/CT_StartDaemon/CTStartDaemon.h
+++ b/MAC/APL/CUDaemons/CT_StartDaemon/CTStartDaemon.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2005
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CUDaemons/CT_StartDaemon/CTStartDaemonMain.cc b/MAC/APL/CUDaemons/CT_StartDaemon/CTStartDaemonMain.cc
index d78c0e9c478..cc7209dcd62 100644
--- a/MAC/APL/CUDaemons/CT_StartDaemon/CTStartDaemonMain.cc
+++ b/MAC/APL/CUDaemons/CT_StartDaemon/CTStartDaemonMain.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2005
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CUDaemons/PVSSGateway_Stub/PVSSGatewayStub.cc b/MAC/APL/CUDaemons/PVSSGateway_Stub/PVSSGatewayStub.cc
index 5140869ae4e..77571f23f3f 100644
--- a/MAC/APL/CUDaemons/PVSSGateway_Stub/PVSSGatewayStub.cc
+++ b/MAC/APL/CUDaemons/PVSSGateway_Stub/PVSSGatewayStub.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2013
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CUDaemons/PVSSGateway_Stub/PVSSGatewayStub.h b/MAC/APL/CUDaemons/PVSSGateway_Stub/PVSSGatewayStub.h
index 6e23dc51aae..826151ce9c6 100644
--- a/MAC/APL/CUDaemons/PVSSGateway_Stub/PVSSGatewayStub.h
+++ b/MAC/APL/CUDaemons/PVSSGateway_Stub/PVSSGatewayStub.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2013
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CUDaemons/PVSSGateway_Stub/PVSSGatewayStubMain.cc b/MAC/APL/CUDaemons/PVSSGateway_Stub/PVSSGatewayStubMain.cc
index f4a46fe0628..2320dca60ba 100644
--- a/MAC/APL/CUDaemons/PVSSGateway_Stub/PVSSGatewayStubMain.cc
+++ b/MAC/APL/CUDaemons/PVSSGateway_Stub/PVSSGatewayStubMain.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2013
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CUDaemons/Service_Broker/ServiceBroker.cc b/MAC/APL/CUDaemons/Service_Broker/ServiceBroker.cc
index 44732d92646..22ea47c26d6 100644
--- a/MAC/APL/CUDaemons/Service_Broker/ServiceBroker.cc
+++ b/MAC/APL/CUDaemons/Service_Broker/ServiceBroker.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CUDaemons/Service_Broker/ServiceBroker.h b/MAC/APL/CUDaemons/Service_Broker/ServiceBroker.h
index e1722f1dfaf..d2ef6b29206 100644
--- a/MAC/APL/CUDaemons/Service_Broker/ServiceBroker.h
+++ b/MAC/APL/CUDaemons/Service_Broker/ServiceBroker.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CUDaemons/Service_Broker/ServiceBrokerMain.cc b/MAC/APL/CUDaemons/Service_Broker/ServiceBrokerMain.cc
index cc23478288b..916c68bbce0 100644
--- a/MAC/APL/CUDaemons/Service_Broker/ServiceBrokerMain.cc
+++ b/MAC/APL/CUDaemons/Service_Broker/ServiceBrokerMain.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CUDaemons/test/EventPort.cc b/MAC/APL/CUDaemons/test/EventPort.cc
index 3dd657c5b51..75d46295fac 100644
--- a/MAC/APL/CUDaemons/test/EventPort.cc
+++ b/MAC/APL/CUDaemons/test/EventPort.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CUDaemons/test/EventPort.h b/MAC/APL/CUDaemons/test/EventPort.h
index 0848d81ab3c..f2ea6b02f35 100644
--- a/MAC/APL/CUDaemons/test/EventPort.h
+++ b/MAC/APL/CUDaemons/test/EventPort.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CUDaemons/test/LDtestMenu.cc b/MAC/APL/CUDaemons/test/LDtestMenu.cc
index dbd7af2b0bf..c0bc2e4ac48 100644
--- a/MAC/APL/CUDaemons/test/LDtestMenu.cc
+++ b/MAC/APL/CUDaemons/test/LDtestMenu.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CUDaemons/test/tLogClient.cc b/MAC/APL/CUDaemons/test/tLogClient.cc
index 8617676a83f..03a45d7ab27 100644
--- a/MAC/APL/CUDaemons/test/tLogClient.cc
+++ b/MAC/APL/CUDaemons/test/tLogClient.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CURTDBDaemons/src/KeyValueLogger/KeyValueLogger.cc b/MAC/APL/CURTDBDaemons/src/KeyValueLogger/KeyValueLogger.cc
index fbf5261f39b..356b2672b7b 100644
--- a/MAC/APL/CURTDBDaemons/src/KeyValueLogger/KeyValueLogger.cc
+++ b/MAC/APL/CURTDBDaemons/src/KeyValueLogger/KeyValueLogger.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2007-2011
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CURTDBDaemons/src/KeyValueLogger/KeyValueLogger.h b/MAC/APL/CURTDBDaemons/src/KeyValueLogger/KeyValueLogger.h
index efcb3d3bec1..8d2112f667c 100644
--- a/MAC/APL/CURTDBDaemons/src/KeyValueLogger/KeyValueLogger.h
+++ b/MAC/APL/CURTDBDaemons/src/KeyValueLogger/KeyValueLogger.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2007-2011
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CURTDBDaemons/src/KeyValueLogger/KeyValueLoggerMain.cc b/MAC/APL/CURTDBDaemons/src/KeyValueLogger/KeyValueLoggerMain.cc
index bfb6138b975..81d25c00e4b 100644
--- a/MAC/APL/CURTDBDaemons/src/KeyValueLogger/KeyValueLoggerMain.cc
+++ b/MAC/APL/CURTDBDaemons/src/KeyValueLogger/KeyValueLoggerMain.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2008
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessor.cc b/MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessor.cc
index 82d4c0951e0..f618a1233f6 100644
--- a/MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessor.cc
+++ b/MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessor.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessor.h b/MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessor.h
index 945270eaf23..6c10acd962d 100644
--- a/MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessor.h
+++ b/MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessor.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessorMain.cc b/MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessorMain.cc
index 65cd3c3cedd..4e866a372b0 100644
--- a/MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessorMain.cc
+++ b/MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessorMain.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CURTDBDaemons/src/PVSSGateway/PVSSGateway.cc b/MAC/APL/CURTDBDaemons/src/PVSSGateway/PVSSGateway.cc
index 0ee7c025975..4875626938b 100644
--- a/MAC/APL/CURTDBDaemons/src/PVSSGateway/PVSSGateway.cc
+++ b/MAC/APL/CURTDBDaemons/src/PVSSGateway/PVSSGateway.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2013
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CURTDBDaemons/src/PVSSGateway/PVSSGateway.h b/MAC/APL/CURTDBDaemons/src/PVSSGateway/PVSSGateway.h
index b9cbf493159..51da4524153 100644
--- a/MAC/APL/CURTDBDaemons/src/PVSSGateway/PVSSGateway.h
+++ b/MAC/APL/CURTDBDaemons/src/PVSSGateway/PVSSGateway.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2013
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CURTDBDaemons/src/PVSSGateway/PVSSGatewayMain.cc b/MAC/APL/CURTDBDaemons/src/PVSSGateway/PVSSGatewayMain.cc
index c598ec2e26a..9f30824c22c 100644
--- a/MAC/APL/CURTDBDaemons/src/PVSSGateway/PVSSGatewayMain.cc
+++ b/MAC/APL/CURTDBDaemons/src/PVSSGateway/PVSSGatewayMain.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2013
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CURTDBDaemons/src/SASGateway/SASGateway.cc b/MAC/APL/CURTDBDaemons/src/SASGateway/SASGateway.cc
index 788a36c18c3..918e6259257 100644
--- a/MAC/APL/CURTDBDaemons/src/SASGateway/SASGateway.cc
+++ b/MAC/APL/CURTDBDaemons/src/SASGateway/SASGateway.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CURTDBDaemons/src/SASGateway/SASGateway.h b/MAC/APL/CURTDBDaemons/src/SASGateway/SASGateway.h
index b4493ed8bfb..d1917c4476c 100644
--- a/MAC/APL/CURTDBDaemons/src/SASGateway/SASGateway.h
+++ b/MAC/APL/CURTDBDaemons/src/SASGateway/SASGateway.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CURTDBDaemons/src/SASGateway/SASGatewayMain.cc b/MAC/APL/CURTDBDaemons/src/SASGateway/SASGatewayMain.cc
index e7c3000739a..4c7b871ff39 100644
--- a/MAC/APL/CURTDBDaemons/src/SASGateway/SASGatewayMain.cc
+++ b/MAC/APL/CURTDBDaemons/src/SASGateway/SASGatewayMain.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2008
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CURTDBDaemons/src/SoftwareMonitor/SoftwareMonitor.cc b/MAC/APL/CURTDBDaemons/src/SoftwareMonitor/SoftwareMonitor.cc
index a60f1b1c9b8..b49165c7311 100644
--- a/MAC/APL/CURTDBDaemons/src/SoftwareMonitor/SoftwareMonitor.cc
+++ b/MAC/APL/CURTDBDaemons/src/SoftwareMonitor/SoftwareMonitor.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2008
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CURTDBDaemons/src/SoftwareMonitor/SoftwareMonitor.h b/MAC/APL/CURTDBDaemons/src/SoftwareMonitor/SoftwareMonitor.h
index eaa3b8c0fae..3fe44b1b4f3 100644
--- a/MAC/APL/CURTDBDaemons/src/SoftwareMonitor/SoftwareMonitor.h
+++ b/MAC/APL/CURTDBDaemons/src/SoftwareMonitor/SoftwareMonitor.h
@@ -2,7 +2,7 @@
 //
 //  Copyright (C) 2008
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CURTDBDaemons/src/SoftwareMonitor/SoftwareMonitorMain.cc b/MAC/APL/CURTDBDaemons/src/SoftwareMonitor/SoftwareMonitorMain.cc
index a1c9969cd39..7dd28c43474 100644
--- a/MAC/APL/CURTDBDaemons/src/SoftwareMonitor/SoftwareMonitorMain.cc
+++ b/MAC/APL/CURTDBDaemons/src/SoftwareMonitor/SoftwareMonitorMain.cc
@@ -2,7 +2,7 @@
 //
 //  Copyright (C) 2008
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CURTDBDaemons/test/tKeyValueLogger.cc b/MAC/APL/CURTDBDaemons/test/tKeyValueLogger.cc
index 469c23b9e89..e83b5f6ec4e 100644
--- a/MAC/APL/CURTDBDaemons/test/tKeyValueLogger.cc
+++ b/MAC/APL/CURTDBDaemons/test/tKeyValueLogger.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CURTDBDaemons/test/tLoggingProcessor.cc b/MAC/APL/CURTDBDaemons/test/tLoggingProcessor.cc
index 304a1ac68e7..02b47c9776a 100644
--- a/MAC/APL/CURTDBDaemons/test/tLoggingProcessor.cc
+++ b/MAC/APL/CURTDBDaemons/test/tLoggingProcessor.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/CURTDBDaemons/test/tPVSSGateway.cc b/MAC/APL/CURTDBDaemons/test/tPVSSGateway.cc
index 63d3ba92205..dbbd90f86ee 100644
--- a/MAC/APL/CURTDBDaemons/test/tPVSSGateway.cc
+++ b/MAC/APL/CURTDBDaemons/test/tPVSSGateway.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2014
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/GUI/jRSP/test/nl/astron/lofar/mac/apl/gui/jrsp/RCUMaskTest.java b/MAC/APL/GUI/jRSP/test/nl/astron/lofar/mac/apl/gui/jrsp/RCUMaskTest.java
index bcd50ddf23b..f91032b23bc 100644
--- a/MAC/APL/GUI/jRSP/test/nl/astron/lofar/mac/apl/gui/jrsp/RCUMaskTest.java
+++ b/MAC/APL/GUI/jRSP/test/nl/astron/lofar/mac/apl/gui/jrsp/RCUMaskTest.java
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2006
  * ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/GUI/jRSP/test/nl/astron/lofar/mac/apl/gui/jrsp/WGRegisterTypeTest.java b/MAC/APL/GUI/jRSP/test/nl/astron/lofar/mac/apl/gui/jrsp/WGRegisterTypeTest.java
index 9c2ba7fe129..29856bc16a5 100644
--- a/MAC/APL/GUI/jRSP/test/nl/astron/lofar/mac/apl/gui/jrsp/WGRegisterTypeTest.java
+++ b/MAC/APL/GUI/jRSP/test/nl/astron/lofar/mac/apl/gui/jrsp/WGRegisterTypeTest.java
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2006
  * ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/GUI/jRSP/test/nl/astron/lofar/mac/apl/gui/jrsp/panels/MaskSelectionPanelTest.java b/MAC/APL/GUI/jRSP/test/nl/astron/lofar/mac/apl/gui/jrsp/panels/MaskSelectionPanelTest.java
index df665b7689d..678f75edef7 100644
--- a/MAC/APL/GUI/jRSP/test/nl/astron/lofar/mac/apl/gui/jrsp/panels/MaskSelectionPanelTest.java
+++ b/MAC/APL/GUI/jRSP/test/nl/astron/lofar/mac/apl/gui/jrsp/panels/MaskSelectionPanelTest.java
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 2006
  * ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Log_Client/src/LogClient.cc b/MAC/APL/Log_Client/src/LogClient.cc
index c7af00711ac..4a11cc92f8c 100644
--- a/MAC/APL/Log_Client/src/LogClient.cc
+++ b/MAC/APL/Log_Client/src/LogClient.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2007-2013
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Log_Client/src/LogClient.h b/MAC/APL/Log_Client/src/LogClient.h
index c444314ad2e..fa98704fc77 100644
--- a/MAC/APL/Log_Client/src/LogClient.h
+++ b/MAC/APL/Log_Client/src/LogClient.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/Log_Client/src/LogClientMain.cc b/MAC/APL/Log_Client/src/LogClientMain.cc
index a05d699b499..f5a6b4f5612 100644
--- a/MAC/APL/Log_Client/src/LogClientMain.cc
+++ b/MAC/APL/Log_Client/src/LogClientMain.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/MD_Protocol/include/MD_Protocol/BeamletAllocation.h b/MAC/APL/MD_Protocol/include/MD_Protocol/BeamletAllocation.h
index e9d7cb9e863..61be1c3579a 100644
--- a/MAC/APL/MD_Protocol/include/MD_Protocol/BeamletAllocation.h
+++ b/MAC/APL/MD_Protocol/include/MD_Protocol/BeamletAllocation.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2009
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/MD_Protocol/include/MD_Protocol/BlAllocArr.h b/MAC/APL/MD_Protocol/include/MD_Protocol/BlAllocArr.h
index 1c63d607170..c18f9a43597 100644
--- a/MAC/APL/MD_Protocol/include/MD_Protocol/BlAllocArr.h
+++ b/MAC/APL/MD_Protocol/include/MD_Protocol/BlAllocArr.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2009
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/MD_Protocol/src/BeamletAllocation.cc b/MAC/APL/MD_Protocol/src/BeamletAllocation.cc
index 9c4d06b4a48..91328987889 100644
--- a/MAC/APL/MD_Protocol/src/BeamletAllocation.cc
+++ b/MAC/APL/MD_Protocol/src/BeamletAllocation.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2009
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/MD_Protocol/src/BlAllocArr.cc b/MAC/APL/MD_Protocol/src/BlAllocArr.cc
index 3feeb9ca220..91ab6defe8e 100644
--- a/MAC/APL/MD_Protocol/src/BlAllocArr.cc
+++ b/MAC/APL/MD_Protocol/src/BlAllocArr.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2009
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/MainCU/src/CRTriggerControl/TriggerControl.cc b/MAC/APL/MainCU/src/CRTriggerControl/TriggerControl.cc
index 13e674d03b5..a6e461c9b1e 100644
--- a/MAC/APL/MainCU/src/CRTriggerControl/TriggerControl.cc
+++ b/MAC/APL/MainCU/src/CRTriggerControl/TriggerControl.cc
@@ -2,7 +2,7 @@
 //
 //  Copyright (C) 2006-2008
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/MainCU/src/CRTriggerControl/TriggerControl.h b/MAC/APL/MainCU/src/CRTriggerControl/TriggerControl.h
index 1b45866c325..705e594c879 100644
--- a/MAC/APL/MainCU/src/CRTriggerControl/TriggerControl.h
+++ b/MAC/APL/MainCU/src/CRTriggerControl/TriggerControl.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2011
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/MainCU/src/CRTriggerControl/TriggerControlMain.cc b/MAC/APL/MainCU/src/CRTriggerControl/TriggerControlMain.cc
index 7fd6086d47c..87401dffcc2 100644
--- a/MAC/APL/MainCU/src/CRTriggerControl/TriggerControlMain.cc
+++ b/MAC/APL/MainCU/src/CRTriggerControl/TriggerControlMain.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/MainCU/src/CRTriggerControl/crctl.cc b/MAC/APL/MainCU/src/CRTriggerControl/crctl.cc
index 12f07a9f57f..43795cb1293 100644
--- a/MAC/APL/MainCU/src/CRTriggerControl/crctl.cc
+++ b/MAC/APL/MainCU/src/CRTriggerControl/crctl.cc
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/MainCU/src/CRTriggerControl/crctl.h b/MAC/APL/MainCU/src/CRTriggerControl/crctl.h
index 1ecd76dccbb..c4c6cf719d1 100644
--- a/MAC/APL/MainCU/src/CRTriggerControl/crctl.h
+++ b/MAC/APL/MainCU/src/CRTriggerControl/crctl.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/MainCU/src/MACScheduler/MACScheduler.cc b/MAC/APL/MainCU/src/MACScheduler/MACScheduler.cc
index 120af530645..a812099ed1b 100644
--- a/MAC/APL/MainCU/src/MACScheduler/MACScheduler.cc
+++ b/MAC/APL/MainCU/src/MACScheduler/MACScheduler.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2004-2012
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/MainCU/src/MACScheduler/MACScheduler.h b/MAC/APL/MainCU/src/MACScheduler/MACScheduler.h
index d45b6280b39..65f6f754792 100644
--- a/MAC/APL/MainCU/src/MACScheduler/MACScheduler.h
+++ b/MAC/APL/MainCU/src/MACScheduler/MACScheduler.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/MainCU/src/MACScheduler/MACSchedulerMain.cc b/MAC/APL/MainCU/src/MACScheduler/MACSchedulerMain.cc
index 5f6b5ab6117..14e7f54e380 100644
--- a/MAC/APL/MainCU/src/MACScheduler/MACSchedulerMain.cc
+++ b/MAC/APL/MainCU/src/MACScheduler/MACSchedulerMain.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/MainCU/src/MACScheduler/ObsClaimer.cc b/MAC/APL/MainCU/src/MACScheduler/ObsClaimer.cc
index 35d7ad030bd..e8e80b190b0 100644
--- a/MAC/APL/MainCU/src/MACScheduler/ObsClaimer.cc
+++ b/MAC/APL/MainCU/src/MACScheduler/ObsClaimer.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/MainCU/src/MACScheduler/ObsClaimer.h b/MAC/APL/MainCU/src/MACScheduler/ObsClaimer.h
index 2d82212d08f..8f15e6ac437 100644
--- a/MAC/APL/MainCU/src/MACScheduler/ObsClaimer.h
+++ b/MAC/APL/MainCU/src/MACScheduler/ObsClaimer.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2008
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/MainCU/src/MACScheduler/claimTest.cc b/MAC/APL/MainCU/src/MACScheduler/claimTest.cc
index 03123f6e762..a95d6bf8056 100644
--- a/MAC/APL/MainCU/src/MACScheduler/claimTest.cc
+++ b/MAC/APL/MainCU/src/MACScheduler/claimTest.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2004-2012
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/MainCU/src/MACScheduler/claimTest.h b/MAC/APL/MainCU/src/MACScheduler/claimTest.h
index 1019fcf30ed..9612497ca1f 100644
--- a/MAC/APL/MainCU/src/MACScheduler/claimTest.h
+++ b/MAC/APL/MainCU/src/MACScheduler/claimTest.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc b/MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc
index a97a0e60791..ac46c6ce423 100644
--- a/MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc
+++ b/MAC/APL/MainCU/src/ObservationControl/ObservationControl.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/MainCU/src/ObservationControl/ObservationControl.h b/MAC/APL/MainCU/src/ObservationControl/ObservationControl.h
index f795f23e6de..79dd634ae6c 100644
--- a/MAC/APL/MainCU/src/ObservationControl/ObservationControl.h
+++ b/MAC/APL/MainCU/src/ObservationControl/ObservationControl.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/MainCU/src/ObservationControl/ObservationControlMain.cc b/MAC/APL/MainCU/src/ObservationControl/ObservationControlMain.cc
index 7c52a1dce68..03387b1c6a7 100644
--- a/MAC/APL/MainCU/src/ObservationControl/ObservationControlMain.cc
+++ b/MAC/APL/MainCU/src/ObservationControl/ObservationControlMain.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/ACC.h b/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/ACC.h
index 9f289c86e00..582d193592f 100644
--- a/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/ACC.h
+++ b/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/ACC.h
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/AntennaArray.h b/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/AntennaArray.h
index e259e1bb860..0b8e9f1cc0f 100644
--- a/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/AntennaArray.h
+++ b/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/AntennaArray.h
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/AntennaArrayData.h b/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/AntennaArrayData.h
index 0278f664b9c..477c30c3590 100644
--- a/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/AntennaArrayData.h
+++ b/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/AntennaArrayData.h
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/AntennaGains.h b/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/AntennaGains.h
index a9d97927fef..57c362ee419 100644
--- a/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/AntennaGains.h
+++ b/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/AntennaGains.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/CalibrationInterface.h b/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/CalibrationInterface.h
index ea8fc70e466..a6f6751c5d5 100644
--- a/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/CalibrationInterface.h
+++ b/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/CalibrationInterface.h
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/SharedResource.h b/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/SharedResource.h
index 9d861cf9026..5c37ac86fdf 100644
--- a/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/SharedResource.h
+++ b/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/SharedResource.h
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/SpectralWindow.h b/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/SpectralWindow.h
index 4cfc45d905f..60a67912b49 100644
--- a/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/SpectralWindow.h
+++ b/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/SpectralWindow.h
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/SubArray.h b/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/SubArray.h
index 6b2c58682ad..b50abb153ae 100644
--- a/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/SubArray.h
+++ b/MAC/APL/PAC/CAL_Protocol/include/APL/CAL_Protocol/SubArray.h
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/CAL_Protocol/src/ACC.cc b/MAC/APL/PAC/CAL_Protocol/src/ACC.cc
index b1878ec0226..77fa5e41dc4 100644
--- a/MAC/APL/PAC/CAL_Protocol/src/ACC.cc
+++ b/MAC/APL/PAC/CAL_Protocol/src/ACC.cc
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/CAL_Protocol/src/AntennaArray.cc b/MAC/APL/PAC/CAL_Protocol/src/AntennaArray.cc
index 1b532f40519..ea93a1f74ae 100644
--- a/MAC/APL/PAC/CAL_Protocol/src/AntennaArray.cc
+++ b/MAC/APL/PAC/CAL_Protocol/src/AntennaArray.cc
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/CAL_Protocol/src/AntennaArrayData.cc b/MAC/APL/PAC/CAL_Protocol/src/AntennaArrayData.cc
index 03bdfd6985c..be0bb1135c2 100644
--- a/MAC/APL/PAC/CAL_Protocol/src/AntennaArrayData.cc
+++ b/MAC/APL/PAC/CAL_Protocol/src/AntennaArrayData.cc
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/CAL_Protocol/src/AntennaGains.cc b/MAC/APL/PAC/CAL_Protocol/src/AntennaGains.cc
index 6f0f68c10b6..14121b9b9d6 100644
--- a/MAC/APL/PAC/CAL_Protocol/src/AntennaGains.cc
+++ b/MAC/APL/PAC/CAL_Protocol/src/AntennaGains.cc
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/CAL_Protocol/src/SpectralWindow.cc b/MAC/APL/PAC/CAL_Protocol/src/SpectralWindow.cc
index 0777a7a3c31..2f88bea2d81 100644
--- a/MAC/APL/PAC/CAL_Protocol/src/SpectralWindow.cc
+++ b/MAC/APL/PAC/CAL_Protocol/src/SpectralWindow.cc
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/CAL_Protocol/src/SubArray.cc b/MAC/APL/PAC/CAL_Protocol/src/SubArray.cc
index 467a5e775a0..cd61d804920 100644
--- a/MAC/APL/PAC/CAL_Protocol/src/SubArray.cc
+++ b/MAC/APL/PAC/CAL_Protocol/src/SubArray.cc
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/Cal_Server/src/ACMProxy.cc b/MAC/APL/PAC/Cal_Server/src/ACMProxy.cc
index 8d92554e4c9..429249da72e 100644
--- a/MAC/APL/PAC/Cal_Server/src/ACMProxy.cc
+++ b/MAC/APL/PAC/Cal_Server/src/ACMProxy.cc
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/Cal_Server/src/ACMProxy.h b/MAC/APL/PAC/Cal_Server/src/ACMProxy.h
index 13043a08eef..d6d9f560a72 100644
--- a/MAC/APL/PAC/Cal_Server/src/ACMProxy.h
+++ b/MAC/APL/PAC/Cal_Server/src/ACMProxy.h
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/Cal_Server/src/BlitzMath.h b/MAC/APL/PAC/Cal_Server/src/BlitzMath.h
index 9d5d3fd6b43..b8c571f1ffb 100644
--- a/MAC/APL/PAC/Cal_Server/src/BlitzMath.h
+++ b/MAC/APL/PAC/Cal_Server/src/BlitzMath.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/Cal_Server/src/BlitzMath.tcc b/MAC/APL/PAC/Cal_Server/src/BlitzMath.tcc
index a194d48bd42..49f79f1e352 100644
--- a/MAC/APL/PAC/Cal_Server/src/BlitzMath.tcc
+++ b/MAC/APL/PAC/Cal_Server/src/BlitzMath.tcc
@@ -3,7 +3,7 @@
 
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/Cal_Server/src/CalServer.cc b/MAC/APL/PAC/Cal_Server/src/CalServer.cc
index 469b5905a0a..ec286099ad4 100644
--- a/MAC/APL/PAC/Cal_Server/src/CalServer.cc
+++ b/MAC/APL/PAC/Cal_Server/src/CalServer.cc
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2014
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/Cal_Server/src/CalServer.h b/MAC/APL/PAC/Cal_Server/src/CalServer.h
index 5687add1f60..80b6e3c5a6e 100644
--- a/MAC/APL/PAC/Cal_Server/src/CalServer.h
+++ b/MAC/APL/PAC/Cal_Server/src/CalServer.h
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/Cal_Server/src/CalibrationAlgorithm.cc b/MAC/APL/PAC/Cal_Server/src/CalibrationAlgorithm.cc
index 4f4549c2856..e287554f560 100644
--- a/MAC/APL/PAC/Cal_Server/src/CalibrationAlgorithm.cc
+++ b/MAC/APL/PAC/Cal_Server/src/CalibrationAlgorithm.cc
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/Cal_Server/src/CalibrationAlgorithm.h b/MAC/APL/PAC/Cal_Server/src/CalibrationAlgorithm.h
index eff68391e3f..ad4ebfd137f 100644
--- a/MAC/APL/PAC/Cal_Server/src/CalibrationAlgorithm.h
+++ b/MAC/APL/PAC/Cal_Server/src/CalibrationAlgorithm.h
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/Cal_Server/src/CalibrationThread.cc b/MAC/APL/PAC/Cal_Server/src/CalibrationThread.cc
index 03c817a229e..bd6e5bc8630 100644
--- a/MAC/APL/PAC/Cal_Server/src/CalibrationThread.cc
+++ b/MAC/APL/PAC/Cal_Server/src/CalibrationThread.cc
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/Cal_Server/src/CalibrationThread.h b/MAC/APL/PAC/Cal_Server/src/CalibrationThread.h
index d51ef4dbae0..a8a163f70dd 100644
--- a/MAC/APL/PAC/Cal_Server/src/CalibrationThread.h
+++ b/MAC/APL/PAC/Cal_Server/src/CalibrationThread.h
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/Cal_Server/src/DipoleModel.cc b/MAC/APL/PAC/Cal_Server/src/DipoleModel.cc
index 11d36c2d192..cf14622287a 100644
--- a/MAC/APL/PAC/Cal_Server/src/DipoleModel.cc
+++ b/MAC/APL/PAC/Cal_Server/src/DipoleModel.cc
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/Cal_Server/src/DipoleModel.h b/MAC/APL/PAC/Cal_Server/src/DipoleModel.h
index e175a3a1e41..70a83c79885 100644
--- a/MAC/APL/PAC/Cal_Server/src/DipoleModel.h
+++ b/MAC/APL/PAC/Cal_Server/src/DipoleModel.h
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/Cal_Server/src/DipoleModelData.cc b/MAC/APL/PAC/Cal_Server/src/DipoleModelData.cc
index 56bf579a104..52dee0f8477 100644
--- a/MAC/APL/PAC/Cal_Server/src/DipoleModelData.cc
+++ b/MAC/APL/PAC/Cal_Server/src/DipoleModelData.cc
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/Cal_Server/src/DipoleModelData.h b/MAC/APL/PAC/Cal_Server/src/DipoleModelData.h
index 5efc5eed62f..ee96e0a80b7 100644
--- a/MAC/APL/PAC/Cal_Server/src/DipoleModelData.h
+++ b/MAC/APL/PAC/Cal_Server/src/DipoleModelData.h
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/Cal_Server/src/RemoteStationCalibration.cc b/MAC/APL/PAC/Cal_Server/src/RemoteStationCalibration.cc
index 8fbb7748fb8..bb9fc698002 100644
--- a/MAC/APL/PAC/Cal_Server/src/RemoteStationCalibration.cc
+++ b/MAC/APL/PAC/Cal_Server/src/RemoteStationCalibration.cc
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/Cal_Server/src/RemoteStationCalibration.h b/MAC/APL/PAC/Cal_Server/src/RemoteStationCalibration.h
index e4823c01684..a70a96a80cd 100644
--- a/MAC/APL/PAC/Cal_Server/src/RemoteStationCalibration.h
+++ b/MAC/APL/PAC/Cal_Server/src/RemoteStationCalibration.h
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/Cal_Server/src/Source.cc b/MAC/APL/PAC/Cal_Server/src/Source.cc
index cfa442977ae..579a41120d5 100644
--- a/MAC/APL/PAC/Cal_Server/src/Source.cc
+++ b/MAC/APL/PAC/Cal_Server/src/Source.cc
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/Cal_Server/src/Source.h b/MAC/APL/PAC/Cal_Server/src/Source.h
index 4341aa73b3f..3a5ebba152e 100644
--- a/MAC/APL/PAC/Cal_Server/src/Source.h
+++ b/MAC/APL/PAC/Cal_Server/src/Source.h
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/Cal_Server/src/SourceData.cc b/MAC/APL/PAC/Cal_Server/src/SourceData.cc
index 9f68e9f1ebd..86380acf382 100644
--- a/MAC/APL/PAC/Cal_Server/src/SourceData.cc
+++ b/MAC/APL/PAC/Cal_Server/src/SourceData.cc
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/Cal_Server/src/SourceData.h b/MAC/APL/PAC/Cal_Server/src/SourceData.h
index 41a7ee222f8..2d07e613e94 100644
--- a/MAC/APL/PAC/Cal_Server/src/SourceData.h
+++ b/MAC/APL/PAC/Cal_Server/src/SourceData.h
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/Cal_Server/src/SubArraySubscription.cc b/MAC/APL/PAC/Cal_Server/src/SubArraySubscription.cc
index 612e25e7862..82c4f46092d 100644
--- a/MAC/APL/PAC/Cal_Server/src/SubArraySubscription.cc
+++ b/MAC/APL/PAC/Cal_Server/src/SubArraySubscription.cc
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/Cal_Server/src/SubArraySubscription.h b/MAC/APL/PAC/Cal_Server/src/SubArraySubscription.h
index 4b8deed1219..015bf46e8b1 100644
--- a/MAC/APL/PAC/Cal_Server/src/SubArraySubscription.h
+++ b/MAC/APL/PAC/Cal_Server/src/SubArraySubscription.h
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/Cal_Server/src/SubArrays.cc b/MAC/APL/PAC/Cal_Server/src/SubArrays.cc
index d7a3c0a3859..ab63cf7014e 100644
--- a/MAC/APL/PAC/Cal_Server/src/SubArrays.cc
+++ b/MAC/APL/PAC/Cal_Server/src/SubArrays.cc
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/Cal_Server/src/SubArrays.h b/MAC/APL/PAC/Cal_Server/src/SubArrays.h
index 3a170c751d5..8d39b88f693 100644
--- a/MAC/APL/PAC/Cal_Server/src/SubArrays.h
+++ b/MAC/APL/PAC/Cal_Server/src/SubArrays.h
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/Cal_Server/src/calinfo.cc b/MAC/APL/PAC/Cal_Server/src/calinfo.cc
index 0f01a7cdd55..b4e785ab2e2 100644
--- a/MAC/APL/PAC/Cal_Server/src/calinfo.cc
+++ b/MAC/APL/PAC/Cal_Server/src/calinfo.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/Cal_Server/src/calinfo.h b/MAC/APL/PAC/Cal_Server/src/calinfo.h
index df98b39b91c..54b31d12e9f 100644
--- a/MAC/APL/PAC/Cal_Server/src/calinfo.h
+++ b/MAC/APL/PAC/Cal_Server/src/calinfo.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/Cal_Server/test/CalTest.cc b/MAC/APL/PAC/Cal_Server/test/CalTest.cc
index 1de780b710f..bc35d558e71 100644
--- a/MAC/APL/PAC/Cal_Server/test/CalTest.cc
+++ b/MAC/APL/PAC/Cal_Server/test/CalTest.cc
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/Cal_Server/test/CalTest.h b/MAC/APL/PAC/Cal_Server/test/CalTest.h
index 1d3238d3ad6..397501a613d 100644
--- a/MAC/APL/PAC/Cal_Server/test/CalTest.h
+++ b/MAC/APL/PAC/Cal_Server/test/CalTest.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/IBS_Protocol/CMakeLists.txt b/MAC/APL/PAC/IBS_Protocol/CMakeLists.txt
index e768a7a1adf..dac769a6880 100644
--- a/MAC/APL/PAC/IBS_Protocol/CMakeLists.txt
+++ b/MAC/APL/PAC/IBS_Protocol/CMakeLists.txt
@@ -2,7 +2,7 @@
 #
 #  Copyright (C) 2008-2009
 #  ASTRON (Netherlands Foundation for Research in Astronomy)
-#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/IBS_Protocol/include/APL/IBS_Protocol/Beamlet2SubbandMap.h b/MAC/APL/PAC/IBS_Protocol/include/APL/IBS_Protocol/Beamlet2SubbandMap.h
index c2a297cc518..ca4e783a84e 100644
--- a/MAC/APL/PAC/IBS_Protocol/include/APL/IBS_Protocol/Beamlet2SubbandMap.h
+++ b/MAC/APL/PAC/IBS_Protocol/include/APL/IBS_Protocol/Beamlet2SubbandMap.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/IBS_Protocol/include/APL/IBS_Protocol/CMakeLists.txt b/MAC/APL/PAC/IBS_Protocol/include/APL/IBS_Protocol/CMakeLists.txt
index 18d23edf43d..77f7d8512c6 100644
--- a/MAC/APL/PAC/IBS_Protocol/include/APL/IBS_Protocol/CMakeLists.txt
+++ b/MAC/APL/PAC/IBS_Protocol/include/APL/IBS_Protocol/CMakeLists.txt
@@ -2,7 +2,7 @@
 #
 #  Copyright (C) 2008-2009
 #  ASTRON (Netherlands Foundation for Research in Astronomy)
-#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/IBS_Protocol/include/APL/IBS_Protocol/Pointing.h b/MAC/APL/PAC/IBS_Protocol/include/APL/IBS_Protocol/Pointing.h
index e27c51ddb64..d474f2b3108 100644
--- a/MAC/APL/PAC/IBS_Protocol/include/APL/IBS_Protocol/Pointing.h
+++ b/MAC/APL/PAC/IBS_Protocol/include/APL/IBS_Protocol/Pointing.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/IBS_Protocol/src/Beamlet2SubbandMap.cc b/MAC/APL/PAC/IBS_Protocol/src/Beamlet2SubbandMap.cc
index 422106d49db..9bbcc73bd9b 100644
--- a/MAC/APL/PAC/IBS_Protocol/src/Beamlet2SubbandMap.cc
+++ b/MAC/APL/PAC/IBS_Protocol/src/Beamlet2SubbandMap.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/IBS_Protocol/src/CMakeLists.txt b/MAC/APL/PAC/IBS_Protocol/src/CMakeLists.txt
index 7f8629e6659..a17490bd9e0 100644
--- a/MAC/APL/PAC/IBS_Protocol/src/CMakeLists.txt
+++ b/MAC/APL/PAC/IBS_Protocol/src/CMakeLists.txt
@@ -2,7 +2,7 @@
 #
 #  Copyright (C) 2008-2009
 #  ASTRON (Netherlands Foundation for Research in Astronomy)
-#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/IBS_Protocol/src/Pointing.cc b/MAC/APL/PAC/IBS_Protocol/src/Pointing.cc
index 65867fc950b..a6010dbe7ae 100644
--- a/MAC/APL/PAC/IBS_Protocol/src/Pointing.cc
+++ b/MAC/APL/PAC/IBS_Protocol/src/Pointing.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2004-2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ICAL_Protocol/include/APL/ICAL_Protocol/AntennaGains.h b/MAC/APL/PAC/ICAL_Protocol/include/APL/ICAL_Protocol/AntennaGains.h
index 5f549a77941..f8161c2c523 100644
--- a/MAC/APL/PAC/ICAL_Protocol/include/APL/ICAL_Protocol/AntennaGains.h
+++ b/MAC/APL/PAC/ICAL_Protocol/include/APL/ICAL_Protocol/AntennaGains.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ICAL_Protocol/include/APL/ICAL_Protocol/SpectralWindow.h b/MAC/APL/PAC/ICAL_Protocol/include/APL/ICAL_Protocol/SpectralWindow.h
index 8bb6d415e08..682bd2209a9 100644
--- a/MAC/APL/PAC/ICAL_Protocol/include/APL/ICAL_Protocol/SpectralWindow.h
+++ b/MAC/APL/PAC/ICAL_Protocol/include/APL/ICAL_Protocol/SpectralWindow.h
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ICAL_Protocol/include/APL/ICAL_Protocol/SubArray.h b/MAC/APL/PAC/ICAL_Protocol/include/APL/ICAL_Protocol/SubArray.h
index 6344e2cc600..fb9835031f1 100644
--- a/MAC/APL/PAC/ICAL_Protocol/include/APL/ICAL_Protocol/SubArray.h
+++ b/MAC/APL/PAC/ICAL_Protocol/include/APL/ICAL_Protocol/SubArray.h
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ICAL_Protocol/src/AntennaGains.cc b/MAC/APL/PAC/ICAL_Protocol/src/AntennaGains.cc
index e9cd9b4c57d..d9af4956b31 100644
--- a/MAC/APL/PAC/ICAL_Protocol/src/AntennaGains.cc
+++ b/MAC/APL/PAC/ICAL_Protocol/src/AntennaGains.cc
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ICAL_Protocol/src/SpectralWindow.cc b/MAC/APL/PAC/ICAL_Protocol/src/SpectralWindow.cc
index 7cd02da3704..1ed72a11682 100644
--- a/MAC/APL/PAC/ICAL_Protocol/src/SpectralWindow.cc
+++ b/MAC/APL/PAC/ICAL_Protocol/src/SpectralWindow.cc
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ICAL_Protocol/src/SubArray.cc b/MAC/APL/PAC/ICAL_Protocol/src/SubArray.cc
index 0ba9d5e45ac..a41c8b67541 100644
--- a/MAC/APL/PAC/ICAL_Protocol/src/SubArray.cc
+++ b/MAC/APL/PAC/ICAL_Protocol/src/SubArray.cc
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFBeamServer/src/AnaBeamMgr.cc b/MAC/APL/PAC/ITRFBeamServer/src/AnaBeamMgr.cc
index 8701cc89fbc..cd78782f1e4 100644
--- a/MAC/APL/PAC/ITRFBeamServer/src/AnaBeamMgr.cc
+++ b/MAC/APL/PAC/ITRFBeamServer/src/AnaBeamMgr.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFBeamServer/src/AnaBeamMgr.h b/MAC/APL/PAC/ITRFBeamServer/src/AnaBeamMgr.h
index 441936e8e95..f303a4388e8 100644
--- a/MAC/APL/PAC/ITRFBeamServer/src/AnaBeamMgr.h
+++ b/MAC/APL/PAC/ITRFBeamServer/src/AnaBeamMgr.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2009
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFBeamServer/src/AnalogueBeam.cc b/MAC/APL/PAC/ITRFBeamServer/src/AnalogueBeam.cc
index 240ccf0fc51..7407bc86485 100644
--- a/MAC/APL/PAC/ITRFBeamServer/src/AnalogueBeam.cc
+++ b/MAC/APL/PAC/ITRFBeamServer/src/AnalogueBeam.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFBeamServer/src/AnalogueBeam.h b/MAC/APL/PAC/ITRFBeamServer/src/AnalogueBeam.h
index 456c2ede321..4e0e8974c86 100644
--- a/MAC/APL/PAC/ITRFBeamServer/src/AnalogueBeam.h
+++ b/MAC/APL/PAC/ITRFBeamServer/src/AnalogueBeam.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2010
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFBeamServer/src/Beam.cc b/MAC/APL/PAC/ITRFBeamServer/src/Beam.cc
index ed9e068e9e3..1389c2ce7d5 100644
--- a/MAC/APL/PAC/ITRFBeamServer/src/Beam.cc
+++ b/MAC/APL/PAC/ITRFBeamServer/src/Beam.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFBeamServer/src/Beam.h b/MAC/APL/PAC/ITRFBeamServer/src/Beam.h
index a425e676e50..0e825d3d0cd 100644
--- a/MAC/APL/PAC/ITRFBeamServer/src/Beam.h
+++ b/MAC/APL/PAC/ITRFBeamServer/src/Beam.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2009
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFBeamServer/src/BeamServer.cc b/MAC/APL/PAC/ITRFBeamServer/src/BeamServer.cc
index d1e44400d51..bf65b2021e5 100644
--- a/MAC/APL/PAC/ITRFBeamServer/src/BeamServer.cc
+++ b/MAC/APL/PAC/ITRFBeamServer/src/BeamServer.cc
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2009
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFBeamServer/src/BeamServer.h b/MAC/APL/PAC/ITRFBeamServer/src/BeamServer.h
index 589bedbcea0..07d08ab6052 100644
--- a/MAC/APL/PAC/ITRFBeamServer/src/BeamServer.h
+++ b/MAC/APL/PAC/ITRFBeamServer/src/BeamServer.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFBeamServer/src/BeamServerConstants.h b/MAC/APL/PAC/ITRFBeamServer/src/BeamServerConstants.h
index 11ffbcb3c8f..ddea924d2a2 100644
--- a/MAC/APL/PAC/ITRFBeamServer/src/BeamServerConstants.h
+++ b/MAC/APL/PAC/ITRFBeamServer/src/BeamServerConstants.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFBeamServer/src/BeamServerMain.cc b/MAC/APL/PAC/ITRFBeamServer/src/BeamServerMain.cc
index 00a98634007..97277917cd7 100644
--- a/MAC/APL/PAC/ITRFBeamServer/src/BeamServerMain.cc
+++ b/MAC/APL/PAC/ITRFBeamServer/src/BeamServerMain.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFBeamServer/src/DigitalBeam.cc b/MAC/APL/PAC/ITRFBeamServer/src/DigitalBeam.cc
index e65040d7a87..65badc0c028 100644
--- a/MAC/APL/PAC/ITRFBeamServer/src/DigitalBeam.cc
+++ b/MAC/APL/PAC/ITRFBeamServer/src/DigitalBeam.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFBeamServer/src/DigitalBeam.h b/MAC/APL/PAC/ITRFBeamServer/src/DigitalBeam.h
index 0aba04f8cee..f4d1c5edf15 100644
--- a/MAC/APL/PAC/ITRFBeamServer/src/DigitalBeam.h
+++ b/MAC/APL/PAC/ITRFBeamServer/src/DigitalBeam.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2009
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFBeamServer/src/StatCal.cc b/MAC/APL/PAC/ITRFBeamServer/src/StatCal.cc
index 7f2147215a1..a71a278506b 100644
--- a/MAC/APL/PAC/ITRFBeamServer/src/StatCal.cc
+++ b/MAC/APL/PAC/ITRFBeamServer/src/StatCal.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFBeamServer/src/StatCal.h b/MAC/APL/PAC/ITRFBeamServer/src/StatCal.h
index d751a762db1..2f273b8ca70 100644
--- a/MAC/APL/PAC/ITRFBeamServer/src/StatCal.h
+++ b/MAC/APL/PAC/ITRFBeamServer/src/StatCal.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFBeamServer/src/beamctl.cc b/MAC/APL/PAC/ITRFBeamServer/src/beamctl.cc
index 1783817e5e6..179e1c3f738 100644
--- a/MAC/APL/PAC/ITRFBeamServer/src/beamctl.cc
+++ b/MAC/APL/PAC/ITRFBeamServer/src/beamctl.cc
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFBeamServer/src/beamctl.h b/MAC/APL/PAC/ITRFBeamServer/src/beamctl.h
index 279cd8a14b1..c0e8eb2d0eb 100644
--- a/MAC/APL/PAC/ITRFBeamServer/src/beamctl.h
+++ b/MAC/APL/PAC/ITRFBeamServer/src/beamctl.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFBeamServer/test/tAnaBeamMgr.cc b/MAC/APL/PAC/ITRFBeamServer/test/tAnaBeamMgr.cc
index 313b9e4b58c..635a91319a4 100644
--- a/MAC/APL/PAC/ITRFBeamServer/test/tAnaBeamMgr.cc
+++ b/MAC/APL/PAC/ITRFBeamServer/test/tAnaBeamMgr.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2010
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFBeamServer/test/tConverter.cc b/MAC/APL/PAC/ITRFBeamServer/test/tConverter.cc
index 4bad0933875..7cdbb48f504 100644
--- a/MAC/APL/PAC/ITRFBeamServer/test/tConverter.cc
+++ b/MAC/APL/PAC/ITRFBeamServer/test/tConverter.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2010
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFBeamServer/test/tHBATracking.cc b/MAC/APL/PAC/ITRFBeamServer/test/tHBATracking.cc
index ec52d06ec82..d6789cb3e93 100644
--- a/MAC/APL/PAC/ITRFBeamServer/test/tHBATracking.cc
+++ b/MAC/APL/PAC/ITRFBeamServer/test/tHBATracking.cc
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2009
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFBeamServer/test/tIdealStartTime.cc b/MAC/APL/PAC/ITRFBeamServer/test/tIdealStartTime.cc
index 2655317b51f..4021d04f45b 100644
--- a/MAC/APL/PAC/ITRFBeamServer/test/tIdealStartTime.cc
+++ b/MAC/APL/PAC/ITRFBeamServer/test/tIdealStartTime.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2010
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFBeamServer/test/tJ2000Converter.cc b/MAC/APL/PAC/ITRFBeamServer/test/tJ2000Converter.cc
index 744e25e4c89..0691a6327c2 100644
--- a/MAC/APL/PAC/ITRFBeamServer/test/tJ2000Converter.cc
+++ b/MAC/APL/PAC/ITRFBeamServer/test/tJ2000Converter.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2010
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFBeamServer/test/tLBATracking.cc b/MAC/APL/PAC/ITRFBeamServer/test/tLBATracking.cc
index eb42983e75e..b5974bcebb7 100644
--- a/MAC/APL/PAC/ITRFBeamServer/test/tLBATracking.cc
+++ b/MAC/APL/PAC/ITRFBeamServer/test/tLBATracking.cc
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2009
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFBeamServer/test/tStatCal.cc b/MAC/APL/PAC/ITRFBeamServer/test/tStatCal.cc
index 0c3908c3fb5..0034865e51a 100644
--- a/MAC/APL/PAC/ITRFBeamServer/test/tStatCal.cc
+++ b/MAC/APL/PAC/ITRFBeamServer/test/tStatCal.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2010
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFCalServer/src/ACC.cc b/MAC/APL/PAC/ITRFCalServer/src/ACC.cc
index 2a00285f8d3..881aec5af36 100644
--- a/MAC/APL/PAC/ITRFCalServer/src/ACC.cc
+++ b/MAC/APL/PAC/ITRFCalServer/src/ACC.cc
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2010
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFCalServer/src/ACC.h b/MAC/APL/PAC/ITRFCalServer/src/ACC.h
index 2342605352f..ab356aa544f 100644
--- a/MAC/APL/PAC/ITRFCalServer/src/ACC.h
+++ b/MAC/APL/PAC/ITRFCalServer/src/ACC.h
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFCalServer/src/ACCcache.cc b/MAC/APL/PAC/ITRFCalServer/src/ACCcache.cc
index 948cbf1e507..860454c5cc1 100644
--- a/MAC/APL/PAC/ITRFCalServer/src/ACCcache.cc
+++ b/MAC/APL/PAC/ITRFCalServer/src/ACCcache.cc
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFCalServer/src/ACCcache.h b/MAC/APL/PAC/ITRFCalServer/src/ACCcache.h
index 784f79a8326..296d927cf7d 100644
--- a/MAC/APL/PAC/ITRFCalServer/src/ACCcache.h
+++ b/MAC/APL/PAC/ITRFCalServer/src/ACCcache.h
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFCalServer/src/ACMProxy.cc b/MAC/APL/PAC/ITRFCalServer/src/ACMProxy.cc
index d0a876bb745..c7304a72b7b 100644
--- a/MAC/APL/PAC/ITRFCalServer/src/ACMProxy.cc
+++ b/MAC/APL/PAC/ITRFCalServer/src/ACMProxy.cc
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFCalServer/src/ACMProxy.h b/MAC/APL/PAC/ITRFCalServer/src/ACMProxy.h
index 243ba8021ce..6fcf5c6fac4 100644
--- a/MAC/APL/PAC/ITRFCalServer/src/ACMProxy.h
+++ b/MAC/APL/PAC/ITRFCalServer/src/ACMProxy.h
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFCalServer/src/CalServer.cc b/MAC/APL/PAC/ITRFCalServer/src/CalServer.cc
index a3aa93871cd..b8eabeeeaa8 100644
--- a/MAC/APL/PAC/ITRFCalServer/src/CalServer.cc
+++ b/MAC/APL/PAC/ITRFCalServer/src/CalServer.cc
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFCalServer/src/CalServer.h b/MAC/APL/PAC/ITRFCalServer/src/CalServer.h
index e20dd60e696..b1a9a392384 100644
--- a/MAC/APL/PAC/ITRFCalServer/src/CalServer.h
+++ b/MAC/APL/PAC/ITRFCalServer/src/CalServer.h
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFCalServer/src/CalServerMain.cc b/MAC/APL/PAC/ITRFCalServer/src/CalServerMain.cc
index 75b569f39f3..60f8fd814f6 100644
--- a/MAC/APL/PAC/ITRFCalServer/src/CalServerMain.cc
+++ b/MAC/APL/PAC/ITRFCalServer/src/CalServerMain.cc
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFCalServer/src/CalibrationThread.cc b/MAC/APL/PAC/ITRFCalServer/src/CalibrationThread.cc
index 3df79d90fae..7ae6f2c44ae 100644
--- a/MAC/APL/PAC/ITRFCalServer/src/CalibrationThread.cc
+++ b/MAC/APL/PAC/ITRFCalServer/src/CalibrationThread.cc
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFCalServer/src/CalibrationThread.h b/MAC/APL/PAC/ITRFCalServer/src/CalibrationThread.h
index 28010e89728..c128dceb712 100644
--- a/MAC/APL/PAC/ITRFCalServer/src/CalibrationThread.h
+++ b/MAC/APL/PAC/ITRFCalServer/src/CalibrationThread.h
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFCalServer/src/LBACalibration.cc b/MAC/APL/PAC/ITRFCalServer/src/LBACalibration.cc
index 6339e24c3f5..91b30ab28dc 100644
--- a/MAC/APL/PAC/ITRFCalServer/src/LBACalibration.cc
+++ b/MAC/APL/PAC/ITRFCalServer/src/LBACalibration.cc
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFCalServer/src/LBACalibration.h b/MAC/APL/PAC/ITRFCalServer/src/LBACalibration.h
index 76d386f4ce0..08db7f11376 100644
--- a/MAC/APL/PAC/ITRFCalServer/src/LBACalibration.h
+++ b/MAC/APL/PAC/ITRFCalServer/src/LBACalibration.h
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFCalServer/src/RequestPool.cc b/MAC/APL/PAC/ITRFCalServer/src/RequestPool.cc
index 7a0928d6d36..6a1a369b2d9 100644
--- a/MAC/APL/PAC/ITRFCalServer/src/RequestPool.cc
+++ b/MAC/APL/PAC/ITRFCalServer/src/RequestPool.cc
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2010
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFCalServer/src/RequestPool.h b/MAC/APL/PAC/ITRFCalServer/src/RequestPool.h
index 5345860bc3e..8f1dd8f937f 100644
--- a/MAC/APL/PAC/ITRFCalServer/src/RequestPool.h
+++ b/MAC/APL/PAC/ITRFCalServer/src/RequestPool.h
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2010
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFCalServer/src/SharedResource.h b/MAC/APL/PAC/ITRFCalServer/src/SharedResource.h
index 103008aae7b..d79cf44aab1 100644
--- a/MAC/APL/PAC/ITRFCalServer/src/SharedResource.h
+++ b/MAC/APL/PAC/ITRFCalServer/src/SharedResource.h
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFCalServer/src/SubArrayMgr.cc b/MAC/APL/PAC/ITRFCalServer/src/SubArrayMgr.cc
index 7cc2863173c..e30ec7d4c17 100644
--- a/MAC/APL/PAC/ITRFCalServer/src/SubArrayMgr.cc
+++ b/MAC/APL/PAC/ITRFCalServer/src/SubArrayMgr.cc
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFCalServer/src/SubArrayMgr.h b/MAC/APL/PAC/ITRFCalServer/src/SubArrayMgr.h
index 4d5564ec1c0..41ae534168b 100644
--- a/MAC/APL/PAC/ITRFCalServer/src/SubArrayMgr.h
+++ b/MAC/APL/PAC/ITRFCalServer/src/SubArrayMgr.h
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFCalServer/src/calinfo.cc b/MAC/APL/PAC/ITRFCalServer/src/calinfo.cc
index 6e1ea2451f0..fdbf7907290 100644
--- a/MAC/APL/PAC/ITRFCalServer/src/calinfo.cc
+++ b/MAC/APL/PAC/ITRFCalServer/src/calinfo.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFCalServer/src/calinfo.h b/MAC/APL/PAC/ITRFCalServer/src/calinfo.h
index c92f13a0e30..e156cc80985 100644
--- a/MAC/APL/PAC/ITRFCalServer/src/calinfo.h
+++ b/MAC/APL/PAC/ITRFCalServer/src/calinfo.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFCalServer/test/CalTest.cc b/MAC/APL/PAC/ITRFCalServer/test/CalTest.cc
index 7c67abd7f55..117430c2f67 100644
--- a/MAC/APL/PAC/ITRFCalServer/test/CalTest.cc
+++ b/MAC/APL/PAC/ITRFCalServer/test/CalTest.cc
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFCalServer/test/CalTest.h b/MAC/APL/PAC/ITRFCalServer/test/CalTest.h
index 88d6973975e..817fb3084d8 100644
--- a/MAC/APL/PAC/ITRFCalServer/test/CalTest.h
+++ b/MAC/APL/PAC/ITRFCalServer/test/CalTest.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFCalServer/test/tCalServer.cc b/MAC/APL/PAC/ITRFCalServer/test/tCalServer.cc
index 949e44f2e23..e3653d8d2a0 100644
--- a/MAC/APL/PAC/ITRFCalServer/test/tCalServer.cc
+++ b/MAC/APL/PAC/ITRFCalServer/test/tCalServer.cc
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2009
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFCalServer/test/tCalServer.h b/MAC/APL/PAC/ITRFCalServer/test/tCalServer.h
index ebf673324d6..a16a0417c5f 100644
--- a/MAC/APL/PAC/ITRFCalServer/test/tCalServer.h
+++ b/MAC/APL/PAC/ITRFCalServer/test/tCalServer.h
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2006
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/ITRFCalServer/test/tSubArrayMgr.cc b/MAC/APL/PAC/ITRFCalServer/test/tSubArrayMgr.cc
index 3b9ec9ce5bd..a06fc153d4c 100644
--- a/MAC/APL/PAC/ITRFCalServer/test/tSubArrayMgr.cc
+++ b/MAC/APL/PAC/ITRFCalServer/test/tSubArrayMgr.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2010
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/SHMInfo_Server/src/PropertyProxy.cc b/MAC/APL/PAC/SHMInfo_Server/src/PropertyProxy.cc
index 5ffd9bd218c..51dcdf0943a 100644
--- a/MAC/APL/PAC/SHMInfo_Server/src/PropertyProxy.cc
+++ b/MAC/APL/PAC/SHMInfo_Server/src/PropertyProxy.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/SHMInfo_Server/src/PropertyProxy.h b/MAC/APL/PAC/SHMInfo_Server/src/PropertyProxy.h
index 88b8ebfe246..4da31d8468a 100644
--- a/MAC/APL/PAC/SHMInfo_Server/src/PropertyProxy.h
+++ b/MAC/APL/PAC/SHMInfo_Server/src/PropertyProxy.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/SHMInfo_Server/src/RspStatus.cc b/MAC/APL/PAC/SHMInfo_Server/src/RspStatus.cc
index 9d6fa2cbb56..092f9f64e89 100644
--- a/MAC/APL/PAC/SHMInfo_Server/src/RspStatus.cc
+++ b/MAC/APL/PAC/SHMInfo_Server/src/RspStatus.cc
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/SHMInfo_Server/src/RspStatus.h b/MAC/APL/PAC/SHMInfo_Server/src/RspStatus.h
index fb0a1c3fcc2..5e969c71528 100644
--- a/MAC/APL/PAC/SHMInfo_Server/src/RspStatus.h
+++ b/MAC/APL/PAC/SHMInfo_Server/src/RspStatus.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/SHMInfo_Server/src/SHMDefines.h b/MAC/APL/PAC/SHMInfo_Server/src/SHMDefines.h
index 64fd343575e..487afba4af7 100644
--- a/MAC/APL/PAC/SHMInfo_Server/src/SHMDefines.h
+++ b/MAC/APL/PAC/SHMInfo_Server/src/SHMDefines.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/SHMInfo_Server/src/SHMInfoServer.cc b/MAC/APL/PAC/SHMInfo_Server/src/SHMInfoServer.cc
index 2ad9ade02cd..f964a2fa885 100644
--- a/MAC/APL/PAC/SHMInfo_Server/src/SHMInfoServer.cc
+++ b/MAC/APL/PAC/SHMInfo_Server/src/SHMInfoServer.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2008
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/SHMInfo_Server/src/SHMInfoServer.h b/MAC/APL/PAC/SHMInfo_Server/src/SHMInfoServer.h
index 11731b830e7..25a962524b7 100644
--- a/MAC/APL/PAC/SHMInfo_Server/src/SHMInfoServer.h
+++ b/MAC/APL/PAC/SHMInfo_Server/src/SHMInfoServer.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2008
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/SHMInfo_Server/src/SHMInfoServerMain.cc b/MAC/APL/PAC/SHMInfo_Server/src/SHMInfoServerMain.cc
index 9ebfdd718c8..3004cdc9fa4 100644
--- a/MAC/APL/PAC/SHMInfo_Server/src/SHMInfoServerMain.cc
+++ b/MAC/APL/PAC/SHMInfo_Server/src/SHMInfoServerMain.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/SHMInfo_Server/src/SHMPolicyHandler.cc b/MAC/APL/PAC/SHMInfo_Server/src/SHMPolicyHandler.cc
index 42d9368beba..406616ec3d8 100644
--- a/MAC/APL/PAC/SHMInfo_Server/src/SHMPolicyHandler.cc
+++ b/MAC/APL/PAC/SHMInfo_Server/src/SHMPolicyHandler.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/SHMInfo_Server/src/SHMPolicyHandler.h b/MAC/APL/PAC/SHMInfo_Server/src/SHMPolicyHandler.h
index 357f2b33784..8af216930b0 100644
--- a/MAC/APL/PAC/SHMInfo_Server/src/SHMPolicyHandler.h
+++ b/MAC/APL/PAC/SHMInfo_Server/src/SHMPolicyHandler.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/SHMInfo_Server/src/SHMSession.cc b/MAC/APL/PAC/SHMInfo_Server/src/SHMSession.cc
index 8b8e2339c43..cf33625872d 100644
--- a/MAC/APL/PAC/SHMInfo_Server/src/SHMSession.cc
+++ b/MAC/APL/PAC/SHMInfo_Server/src/SHMSession.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2008
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/SHMInfo_Server/src/SHMSession.h b/MAC/APL/PAC/SHMInfo_Server/src/SHMSession.h
index ba9166605f7..99d143562c3 100644
--- a/MAC/APL/PAC/SHMInfo_Server/src/SHMSession.h
+++ b/MAC/APL/PAC/SHMInfo_Server/src/SHMSession.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/SHMInfo_Server/src/SHMSubscription.cc b/MAC/APL/PAC/SHMInfo_Server/src/SHMSubscription.cc
index 09f4e530804..427b81810ab 100644
--- a/MAC/APL/PAC/SHMInfo_Server/src/SHMSubscription.cc
+++ b/MAC/APL/PAC/SHMInfo_Server/src/SHMSubscription.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/SHMInfo_Server/src/SHMSubscription.h b/MAC/APL/PAC/SHMInfo_Server/src/SHMSubscription.h
index 0e33373f593..bd9f1610bfc 100644
--- a/MAC/APL/PAC/SHMInfo_Server/src/SHMSubscription.h
+++ b/MAC/APL/PAC/SHMInfo_Server/src/SHMSubscription.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/SHMInfo_Server/src/XCStatistics.cc b/MAC/APL/PAC/SHMInfo_Server/src/XCStatistics.cc
index d044dc6853a..2f380a91a6e 100644
--- a/MAC/APL/PAC/SHMInfo_Server/src/XCStatistics.cc
+++ b/MAC/APL/PAC/SHMInfo_Server/src/XCStatistics.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/SHMInfo_Server/src/XCStatistics.h b/MAC/APL/PAC/SHMInfo_Server/src/XCStatistics.h
index c6ec991ed51..f3fbcea0560 100644
--- a/MAC/APL/PAC/SHMInfo_Server/src/XCStatistics.h
+++ b/MAC/APL/PAC/SHMInfo_Server/src/XCStatistics.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PAC/SHMInfo_Server/test/MACall.tse.prot b/MAC/APL/PAC/SHMInfo_Server/test/MACall.tse.prot
index 604901a23fb..878856f9c27 100644
--- a/MAC/APL/PAC/SHMInfo_Server/test/MACall.tse.prot
+++ b/MAC/APL/PAC/SHMInfo_Server/test/MACall.tse.prot
@@ -5,7 +5,7 @@
 //
 //  Copyright (C) 2005
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
diff --git a/MAC/APL/PAC/SHMInfo_Server/test/mis.btsw b/MAC/APL/PAC/SHMInfo_Server/test/mis.btsw
index 96a68ea2ad4..15759834c96 100644
--- a/MAC/APL/PAC/SHMInfo_Server/test/mis.btsw
+++ b/MAC/APL/PAC/SHMInfo_Server/test/mis.btsw
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2005
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 // ------------------------------------------------------------------------------
 // Description:
diff --git a/MAC/APL/PIC/ETHTest/src/DataEvent.h b/MAC/APL/PIC/ETHTest/src/DataEvent.h
index cd9fe3468d7..bc28593ac88 100644
--- a/MAC/APL/PIC/ETHTest/src/DataEvent.h
+++ b/MAC/APL/PIC/ETHTest/src/DataEvent.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/ETHTest/src/ETH_realtime.cc b/MAC/APL/PIC/ETHTest/src/ETH_realtime.cc
index 2261b28b051..24fc12c1b85 100644
--- a/MAC/APL/PIC/ETHTest/src/ETH_realtime.cc
+++ b/MAC/APL/PIC/ETHTest/src/ETH_realtime.cc
@@ -4,7 +4,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/ETHTest/src/ETH_test.cc b/MAC/APL/PIC/ETHTest/src/ETH_test.cc
index 884c10c5605..2bbb57a7af7 100755
--- a/MAC/APL/PIC/ETHTest/src/ETH_test.cc
+++ b/MAC/APL/PIC/ETHTest/src/ETH_test.cc
@@ -5,7 +5,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/ETHTest/src/MEPData.cc b/MAC/APL/PIC/ETHTest/src/MEPData.cc
index 12925c304a9..09c16bb5f54 100644
--- a/MAC/APL/PIC/ETHTest/src/MEPData.cc
+++ b/MAC/APL/PIC/ETHTest/src/MEPData.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/ETHTest/src/MEPData.h b/MAC/APL/PIC/ETHTest/src/MEPData.h
index 3c5e48a637d..c8889744142 100644
--- a/MAC/APL/PIC/ETHTest/src/MEPData.h
+++ b/MAC/APL/PIC/ETHTest/src/MEPData.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/ETHTest/src/TCP_test.cc b/MAC/APL/PIC/ETHTest/src/TCP_test.cc
index 38123105676..a3cd62e3bbc 100755
--- a/MAC/APL/PIC/ETHTest/src/TCP_test.cc
+++ b/MAC/APL/PIC/ETHTest/src/TCP_test.cc
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/ETHTest/src/UDP_test.cc b/MAC/APL/PIC/ETHTest/src/UDP_test.cc
index cfbce700257..d9762986ffe 100755
--- a/MAC/APL/PIC/ETHTest/src/UDP_test.cc
+++ b/MAC/APL/PIC/ETHTest/src/UDP_test.cc
@@ -5,7 +5,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/BMRead.cc b/MAC/APL/PIC/RSP_Driver/src/BMRead.cc
index 1f562604615..6fe90647eb8 100644
--- a/MAC/APL/PIC/RSP_Driver/src/BMRead.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/BMRead.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/BMRead.h b/MAC/APL/PIC/RSP_Driver/src/BMRead.h
index 959910abd3d..115b119eb6b 100644
--- a/MAC/APL/PIC/RSP_Driver/src/BMRead.h
+++ b/MAC/APL/PIC/RSP_Driver/src/BMRead.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/BMWrite.cc b/MAC/APL/PIC/RSP_Driver/src/BMWrite.cc
index e884df65895..cf5289f508d 100644
--- a/MAC/APL/PIC/RSP_Driver/src/BMWrite.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/BMWrite.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/BMWrite.h b/MAC/APL/PIC/RSP_Driver/src/BMWrite.h
index cff5d3910ce..cb36ba66ca8 100644
--- a/MAC/APL/PIC/RSP_Driver/src/BMWrite.h
+++ b/MAC/APL/PIC/RSP_Driver/src/BMWrite.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/BSWrite.cc b/MAC/APL/PIC/RSP_Driver/src/BSWrite.cc
index 71b46943ca4..233c5fb0640 100644
--- a/MAC/APL/PIC/RSP_Driver/src/BSWrite.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/BSWrite.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/BSWrite.h b/MAC/APL/PIC/RSP_Driver/src/BSWrite.h
index cdc0547c8e0..131aae2b47c 100644
--- a/MAC/APL/PIC/RSP_Driver/src/BSWrite.h
+++ b/MAC/APL/PIC/RSP_Driver/src/BSWrite.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/BWRead.cc b/MAC/APL/PIC/RSP_Driver/src/BWRead.cc
index a8d2f4266f0..8fd1ee8530e 100644
--- a/MAC/APL/PIC/RSP_Driver/src/BWRead.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/BWRead.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/BWRead.h b/MAC/APL/PIC/RSP_Driver/src/BWRead.h
index a72c381ade4..2d4a86d785c 100644
--- a/MAC/APL/PIC/RSP_Driver/src/BWRead.h
+++ b/MAC/APL/PIC/RSP_Driver/src/BWRead.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/BWWrite.cc b/MAC/APL/PIC/RSP_Driver/src/BWWrite.cc
index d04fd573c35..94d4b508697 100644
--- a/MAC/APL/PIC/RSP_Driver/src/BWWrite.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/BWWrite.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/BWWrite.h b/MAC/APL/PIC/RSP_Driver/src/BWWrite.h
index bc8a9c8dc72..dd197d34b66 100644
--- a/MAC/APL/PIC/RSP_Driver/src/BWWrite.h
+++ b/MAC/APL/PIC/RSP_Driver/src/BWWrite.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/BstRead.cc b/MAC/APL/PIC/RSP_Driver/src/BstRead.cc
index fb466d26166..25ddf0c2790 100644
--- a/MAC/APL/PIC/RSP_Driver/src/BstRead.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/BstRead.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/BstRead.h b/MAC/APL/PIC/RSP_Driver/src/BstRead.h
index efbeb5d320e..8ef28ad8da0 100644
--- a/MAC/APL/PIC/RSP_Driver/src/BstRead.h
+++ b/MAC/APL/PIC/RSP_Driver/src/BstRead.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/BypassRead.cc b/MAC/APL/PIC/RSP_Driver/src/BypassRead.cc
index 4d72cc91335..7883589946e 100644
--- a/MAC/APL/PIC/RSP_Driver/src/BypassRead.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/BypassRead.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/BypassRead.h b/MAC/APL/PIC/RSP_Driver/src/BypassRead.h
index 3720fe6ed27..4eb1c77e1ca 100644
--- a/MAC/APL/PIC/RSP_Driver/src/BypassRead.h
+++ b/MAC/APL/PIC/RSP_Driver/src/BypassRead.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/BypassWrite.cc b/MAC/APL/PIC/RSP_Driver/src/BypassWrite.cc
index 92504ac0007..67861b54ee1 100644
--- a/MAC/APL/PIC/RSP_Driver/src/BypassWrite.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/BypassWrite.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/BypassWrite.h b/MAC/APL/PIC/RSP_Driver/src/BypassWrite.h
index 9ee5f59607c..9a37bda9560 100644
--- a/MAC/APL/PIC/RSP_Driver/src/BypassWrite.h
+++ b/MAC/APL/PIC/RSP_Driver/src/BypassWrite.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/CDOWrite.cc b/MAC/APL/PIC/RSP_Driver/src/CDOWrite.cc
index 8e5868f8032..33b8e8c04a4 100644
--- a/MAC/APL/PIC/RSP_Driver/src/CDOWrite.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/CDOWrite.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/CDOWrite.h b/MAC/APL/PIC/RSP_Driver/src/CDOWrite.h
index a00ad193b78..625d155a3ca 100644
--- a/MAC/APL/PIC/RSP_Driver/src/CDOWrite.h
+++ b/MAC/APL/PIC/RSP_Driver/src/CDOWrite.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/CRSyncWrite.cc b/MAC/APL/PIC/RSP_Driver/src/CRSyncWrite.cc
index 76e7a0417ff..1a4f4d52d86 100644
--- a/MAC/APL/PIC/RSP_Driver/src/CRSyncWrite.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/CRSyncWrite.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2011
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/CRSyncWrite.h b/MAC/APL/PIC/RSP_Driver/src/CRSyncWrite.h
index 3947658127c..3310a8a6f43 100644
--- a/MAC/APL/PIC/RSP_Driver/src/CRSyncWrite.h
+++ b/MAC/APL/PIC/RSP_Driver/src/CRSyncWrite.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/CableAttenuation.cc b/MAC/APL/PIC/RSP_Driver/src/CableAttenuation.cc
index bd127ccf324..b66c9465018 100644
--- a/MAC/APL/PIC/RSP_Driver/src/CableAttenuation.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/CableAttenuation.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2009
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/CableAttenuation.h b/MAC/APL/PIC/RSP_Driver/src/CableAttenuation.h
index 9e04cb36eef..ba0da668399 100644
--- a/MAC/APL/PIC/RSP_Driver/src/CableAttenuation.h
+++ b/MAC/APL/PIC/RSP_Driver/src/CableAttenuation.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2009
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/CableSettings.cc b/MAC/APL/PIC/RSP_Driver/src/CableSettings.cc
index 1c059fe80b7..b2e85b5b810 100644
--- a/MAC/APL/PIC/RSP_Driver/src/CableSettings.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/CableSettings.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/CableSettings.h b/MAC/APL/PIC/RSP_Driver/src/CableSettings.h
index e3cd3266f9c..055cd2cf484 100644
--- a/MAC/APL/PIC/RSP_Driver/src/CableSettings.h
+++ b/MAC/APL/PIC/RSP_Driver/src/CableSettings.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2009
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/Cache.cc b/MAC/APL/PIC/RSP_Driver/src/Cache.cc
index 93110ccc2ef..1de6158739f 100644
--- a/MAC/APL/PIC/RSP_Driver/src/Cache.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/Cache.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/Cache.h b/MAC/APL/PIC/RSP_Driver/src/Cache.h
index ce164ebedaf..041d1505b1f 100644
--- a/MAC/APL/PIC/RSP_Driver/src/Cache.h
+++ b/MAC/APL/PIC/RSP_Driver/src/Cache.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/Command.h b/MAC/APL/PIC/RSP_Driver/src/Command.h
index d0b8708a03d..5dcb83fd162 100644
--- a/MAC/APL/PIC/RSP_Driver/src/Command.h
+++ b/MAC/APL/PIC/RSP_Driver/src/Command.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetBitModeCmd.cc b/MAC/APL/PIC/RSP_Driver/src/GetBitModeCmd.cc
index c44108c38e4..217efbe5577 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetBitModeCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/GetBitModeCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetBitModeCmd.h b/MAC/APL/PIC/RSP_Driver/src/GetBitModeCmd.h
index 3f9c21e5909..7ff760f3c92 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetBitModeCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/GetBitModeCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetBypassCmd.cc b/MAC/APL/PIC/RSP_Driver/src/GetBypassCmd.cc
index 89c3df4e0f0..f693cb4b088 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetBypassCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/GetBypassCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetBypassCmd.h b/MAC/APL/PIC/RSP_Driver/src/GetBypassCmd.h
index b58829869e9..5a5a72050f1 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetBypassCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/GetBypassCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetClocksCmd.cc b/MAC/APL/PIC/RSP_Driver/src/GetClocksCmd.cc
index 0ccfe6c66ca..3f5ae77e477 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetClocksCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/GetClocksCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetClocksCmd.h b/MAC/APL/PIC/RSP_Driver/src/GetClocksCmd.h
index fbfc5a7e645..77b8444b704 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetClocksCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/GetClocksCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetDatastreamCmd.cc b/MAC/APL/PIC/RSP_Driver/src/GetDatastreamCmd.cc
index 265e61e4139..e6046345197 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetDatastreamCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/GetDatastreamCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2009
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetDatastreamCmd.h b/MAC/APL/PIC/RSP_Driver/src/GetDatastreamCmd.h
index 71823b6dad6..828b407c3e0 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetDatastreamCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/GetDatastreamCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2009
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetHBACmd.cc b/MAC/APL/PIC/RSP_Driver/src/GetHBACmd.cc
index 3d1bfd68879..76fad39bc33 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetHBACmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/GetHBACmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetHBACmd.h b/MAC/APL/PIC/RSP_Driver/src/GetHBACmd.h
index 62ae49b9165..3f25d335b27 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetHBACmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/GetHBACmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetLatencyCmd.cc b/MAC/APL/PIC/RSP_Driver/src/GetLatencyCmd.cc
index 36c656f93ea..95515a29a51 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetLatencyCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/GetLatencyCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetLatencyCmd.h b/MAC/APL/PIC/RSP_Driver/src/GetLatencyCmd.h
index e19d802999a..40fe4cb9c00 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetLatencyCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/GetLatencyCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetRCUCmd.cc b/MAC/APL/PIC/RSP_Driver/src/GetRCUCmd.cc
index 4a837a4fd93..5e49ffc29be 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetRCUCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/GetRCUCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetRCUCmd.h b/MAC/APL/PIC/RSP_Driver/src/GetRCUCmd.h
index b2fe5de7072..95fe84789a8 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetRCUCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/GetRCUCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetRawBlockCmd.cc b/MAC/APL/PIC/RSP_Driver/src/GetRawBlockCmd.cc
index 3050841c8b6..a848d63f769 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetRawBlockCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/GetRawBlockCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2008
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetRawBlockCmd.h b/MAC/APL/PIC/RSP_Driver/src/GetRawBlockCmd.h
index 9cf4a40926c..9a8b55ec6b3 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetRawBlockCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/GetRawBlockCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2008
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetRegisterStateCmd.cc b/MAC/APL/PIC/RSP_Driver/src/GetRegisterStateCmd.cc
index 2241bde063a..0a9e075e1fa 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetRegisterStateCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/GetRegisterStateCmd.cc
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetRegisterStateCmd.h b/MAC/APL/PIC/RSP_Driver/src/GetRegisterStateCmd.h
index b9f264edaed..ca8e82de724 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetRegisterStateCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/GetRegisterStateCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetSDOCmd.cc b/MAC/APL/PIC/RSP_Driver/src/GetSDOCmd.cc
index dbf079624f9..924041df194 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetSDOCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/GetSDOCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetSDOCmd.h b/MAC/APL/PIC/RSP_Driver/src/GetSDOCmd.h
index 07932bd3711..f192131716d 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetSDOCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/GetSDOCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetSDOModeCmd.cc b/MAC/APL/PIC/RSP_Driver/src/GetSDOModeCmd.cc
index e6b0c878186..b05d16177ea 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetSDOModeCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/GetSDOModeCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetSDOModeCmd.h b/MAC/APL/PIC/RSP_Driver/src/GetSDOModeCmd.h
index 6e71ef990d9..454897aebd0 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetSDOModeCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/GetSDOModeCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetSPUStatusCmd.cc b/MAC/APL/PIC/RSP_Driver/src/GetSPUStatusCmd.cc
index 67442a5dcf4..51431c90263 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetSPUStatusCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/GetSPUStatusCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2008
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetSPUStatusCmd.h b/MAC/APL/PIC/RSP_Driver/src/GetSPUStatusCmd.h
index d2ec28759fe..7622783fe7b 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetSPUStatusCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/GetSPUStatusCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2008
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetSplitterCmd.cc b/MAC/APL/PIC/RSP_Driver/src/GetSplitterCmd.cc
index 5fd68a18b93..a38993cfdaf 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetSplitterCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/GetSplitterCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2009
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetSplitterCmd.h b/MAC/APL/PIC/RSP_Driver/src/GetSplitterCmd.h
index ced188c9ff5..712d77dddb8 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetSplitterCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/GetSplitterCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2009
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetStatsCmd.cc b/MAC/APL/PIC/RSP_Driver/src/GetStatsCmd.cc
index 5ddf6079dd9..444110e253d 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetStatsCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/GetStatsCmd.cc
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetStatsCmd.h b/MAC/APL/PIC/RSP_Driver/src/GetStatsCmd.h
index 51361bc915d..17714ea1d64 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetStatsCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/GetStatsCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetStatusCmd.cc b/MAC/APL/PIC/RSP_Driver/src/GetStatusCmd.cc
index 72a6b0619c2..84473a9e279 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetStatusCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/GetStatusCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetStatusCmd.h b/MAC/APL/PIC/RSP_Driver/src/GetStatusCmd.h
index ad658c85926..40c928071a0 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetStatusCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/GetStatusCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetSubbandsCmd.cc b/MAC/APL/PIC/RSP_Driver/src/GetSubbandsCmd.cc
index 7d9a87db638..d19e8470429 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetSubbandsCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/GetSubbandsCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetSubbandsCmd.h b/MAC/APL/PIC/RSP_Driver/src/GetSubbandsCmd.h
index d8f248f2034..3e3ff8e2545 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetSubbandsCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/GetSubbandsCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetSwapxyCmd.cc b/MAC/APL/PIC/RSP_Driver/src/GetSwapxyCmd.cc
index 351c76facbb..6f5909983f8 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetSwapxyCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/GetSwapxyCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetSwapxyCmd.h b/MAC/APL/PIC/RSP_Driver/src/GetSwapxyCmd.h
index a7a48a637ca..9ac9965f0d6 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetSwapxyCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/GetSwapxyCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetTBBCmd.cc b/MAC/APL/PIC/RSP_Driver/src/GetTBBCmd.cc
index ceb2a3b9d64..5fa12389c63 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetTBBCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/GetTBBCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetTBBCmd.h b/MAC/APL/PIC/RSP_Driver/src/GetTBBCmd.h
index 044c852a09c..d29afba3dea 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetTBBCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/GetTBBCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetTDStatusCmd.cc b/MAC/APL/PIC/RSP_Driver/src/GetTDStatusCmd.cc
index ade36e29965..ed81e9e5013 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetTDStatusCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/GetTDStatusCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetTDStatusCmd.h b/MAC/APL/PIC/RSP_Driver/src/GetTDStatusCmd.h
index 6b449dd3906..9942a0a688d 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetTDStatusCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/GetTDStatusCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetVersionsCmd.cc b/MAC/APL/PIC/RSP_Driver/src/GetVersionsCmd.cc
index d408705b62f..f8218532e2f 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetVersionsCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/GetVersionsCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetVersionsCmd.h b/MAC/APL/PIC/RSP_Driver/src/GetVersionsCmd.h
index eb641ecddcd..ed6be02742c 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetVersionsCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/GetVersionsCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetWGCmd.cc b/MAC/APL/PIC/RSP_Driver/src/GetWGCmd.cc
index e24ae3e29c6..d1d134c9017 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetWGCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/GetWGCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetWGCmd.h b/MAC/APL/PIC/RSP_Driver/src/GetWGCmd.h
index 7e5b2ae34b3..7b0f868284d 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetWGCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/GetWGCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetWeightsCmd.cc b/MAC/APL/PIC/RSP_Driver/src/GetWeightsCmd.cc
index aad83b39e09..1e51a31c8d7 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetWeightsCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/GetWeightsCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetWeightsCmd.h b/MAC/APL/PIC/RSP_Driver/src/GetWeightsCmd.h
index 80bda156762..845cac4b4ef 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetWeightsCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/GetWeightsCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetXCStatsCmd.cc b/MAC/APL/PIC/RSP_Driver/src/GetXCStatsCmd.cc
index e9485468779..ba13300a1ba 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetXCStatsCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/GetXCStatsCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/GetXCStatsCmd.h b/MAC/APL/PIC/RSP_Driver/src/GetXCStatsCmd.h
index 5af44c4a7c9..cc8a62db704 100644
--- a/MAC/APL/PIC/RSP_Driver/src/GetXCStatsCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/GetXCStatsCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/HBAProtocolWrite.cc b/MAC/APL/PIC/RSP_Driver/src/HBAProtocolWrite.cc
index 55a1924eccf..84da6e2eb54 100644
--- a/MAC/APL/PIC/RSP_Driver/src/HBAProtocolWrite.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/HBAProtocolWrite.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/HBAProtocolWrite.h b/MAC/APL/PIC/RSP_Driver/src/HBAProtocolWrite.h
index a0ac46cdaa1..32cf5f2e952 100644
--- a/MAC/APL/PIC/RSP_Driver/src/HBAProtocolWrite.h
+++ b/MAC/APL/PIC/RSP_Driver/src/HBAProtocolWrite.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/HBAResultRead.cc b/MAC/APL/PIC/RSP_Driver/src/HBAResultRead.cc
index 9d2378319a4..9ed44cafa1f 100644
--- a/MAC/APL/PIC/RSP_Driver/src/HBAResultRead.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/HBAResultRead.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/HBAResultRead.h b/MAC/APL/PIC/RSP_Driver/src/HBAResultRead.h
index 7405aced20d..0187b556d68 100644
--- a/MAC/APL/PIC/RSP_Driver/src/HBAResultRead.h
+++ b/MAC/APL/PIC/RSP_Driver/src/HBAResultRead.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/LatencyRead.cc b/MAC/APL/PIC/RSP_Driver/src/LatencyRead.cc
index e6485a25592..c24d4bf0d27 100644
--- a/MAC/APL/PIC/RSP_Driver/src/LatencyRead.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/LatencyRead.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/LatencyRead.h b/MAC/APL/PIC/RSP_Driver/src/LatencyRead.h
index 3fc526fb0b9..dec4ce9d2e3 100644
--- a/MAC/APL/PIC/RSP_Driver/src/LatencyRead.h
+++ b/MAC/APL/PIC/RSP_Driver/src/LatencyRead.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/RADWrite.cc b/MAC/APL/PIC/RSP_Driver/src/RADWrite.cc
index 203a5b08a4f..8659b1de434 100644
--- a/MAC/APL/PIC/RSP_Driver/src/RADWrite.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/RADWrite.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/RADWrite.h b/MAC/APL/PIC/RSP_Driver/src/RADWrite.h
index fcca2fd981d..4d0b321b05f 100644
--- a/MAC/APL/PIC/RSP_Driver/src/RADWrite.h
+++ b/MAC/APL/PIC/RSP_Driver/src/RADWrite.h
@@ -5,7 +5,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/RCUCables.cc b/MAC/APL/PIC/RSP_Driver/src/RCUCables.cc
index 3749e4548cf..18344ea22a1 100644
--- a/MAC/APL/PIC/RSP_Driver/src/RCUCables.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/RCUCables.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2009
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/RCUCables.h b/MAC/APL/PIC/RSP_Driver/src/RCUCables.h
index 909bfa5a4f5..48faeeb4c03 100644
--- a/MAC/APL/PIC/RSP_Driver/src/RCUCables.h
+++ b/MAC/APL/PIC/RSP_Driver/src/RCUCables.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2009
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/RCUProtocolWrite.cc b/MAC/APL/PIC/RSP_Driver/src/RCUProtocolWrite.cc
index 80ec840a07c..3e3adffd2ab 100644
--- a/MAC/APL/PIC/RSP_Driver/src/RCUProtocolWrite.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/RCUProtocolWrite.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/RCUProtocolWrite.h b/MAC/APL/PIC/RSP_Driver/src/RCUProtocolWrite.h
index 3247d0a19d3..55ea313cce9 100644
--- a/MAC/APL/PIC/RSP_Driver/src/RCUProtocolWrite.h
+++ b/MAC/APL/PIC/RSP_Driver/src/RCUProtocolWrite.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/RCURead.cc b/MAC/APL/PIC/RSP_Driver/src/RCURead.cc
index e9b9675e9b8..6fbaf0cbb2e 100644
--- a/MAC/APL/PIC/RSP_Driver/src/RCURead.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/RCURead.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/RCURead.h b/MAC/APL/PIC/RSP_Driver/src/RCURead.h
index 70af48ecb4c..94d0d0fbbe2 100644
--- a/MAC/APL/PIC/RSP_Driver/src/RCURead.h
+++ b/MAC/APL/PIC/RSP_Driver/src/RCURead.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/RCUResultRead.cc b/MAC/APL/PIC/RSP_Driver/src/RCUResultRead.cc
index 74ad5184ed4..cc9a8e7282f 100644
--- a/MAC/APL/PIC/RSP_Driver/src/RCUResultRead.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/RCUResultRead.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/RCUResultRead.h b/MAC/APL/PIC/RSP_Driver/src/RCUResultRead.h
index 52ed9ebf25f..dc9b794b22a 100644
--- a/MAC/APL/PIC/RSP_Driver/src/RCUResultRead.h
+++ b/MAC/APL/PIC/RSP_Driver/src/RCUResultRead.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/RCUWrite.cc b/MAC/APL/PIC/RSP_Driver/src/RCUWrite.cc
index 1cd0c908d15..6686207044e 100644
--- a/MAC/APL/PIC/RSP_Driver/src/RCUWrite.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/RCUWrite.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/RCUWrite.h b/MAC/APL/PIC/RSP_Driver/src/RCUWrite.h
index d208746e229..20e71ef972c 100644
--- a/MAC/APL/PIC/RSP_Driver/src/RCUWrite.h
+++ b/MAC/APL/PIC/RSP_Driver/src/RCUWrite.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/RSPDriver.cc b/MAC/APL/PIC/RSP_Driver/src/RSPDriver.cc
index 0787b2c3b01..0a4a3498828 100644
--- a/MAC/APL/PIC/RSP_Driver/src/RSPDriver.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/RSPDriver.cc
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/RSPDriver.h b/MAC/APL/PIC/RSP_Driver/src/RSPDriver.h
index 73d6d51f423..2b28635f364 100644
--- a/MAC/APL/PIC/RSP_Driver/src/RSPDriver.h
+++ b/MAC/APL/PIC/RSP_Driver/src/RSPDriver.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/RSUWrite.cc b/MAC/APL/PIC/RSP_Driver/src/RSUWrite.cc
index 248363d5884..0591cc7562a 100644
--- a/MAC/APL/PIC/RSP_Driver/src/RSUWrite.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/RSUWrite.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/RSUWrite.h b/MAC/APL/PIC/RSP_Driver/src/RSUWrite.h
index fafc3e9bcb5..da1e5676ae8 100644
--- a/MAC/APL/PIC/RSP_Driver/src/RSUWrite.h
+++ b/MAC/APL/PIC/RSP_Driver/src/RSUWrite.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/RawBlockRead.cc b/MAC/APL/PIC/RSP_Driver/src/RawBlockRead.cc
index da78e5c24b6..171cf51478c 100644
--- a/MAC/APL/PIC/RSP_Driver/src/RawBlockRead.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/RawBlockRead.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/RawBlockRead.h b/MAC/APL/PIC/RSP_Driver/src/RawBlockRead.h
index 57e4d632f64..6fcfa4f6e98 100644
--- a/MAC/APL/PIC/RSP_Driver/src/RawBlockRead.h
+++ b/MAC/APL/PIC/RSP_Driver/src/RawBlockRead.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/RawBlockWrite.cc b/MAC/APL/PIC/RSP_Driver/src/RawBlockWrite.cc
index 6de5bcf1926..143930fb740 100644
--- a/MAC/APL/PIC/RSP_Driver/src/RawBlockWrite.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/RawBlockWrite.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/RawBlockWrite.h b/MAC/APL/PIC/RSP_Driver/src/RawBlockWrite.h
index 7df842637be..fbadcdafb9b 100644
--- a/MAC/APL/PIC/RSP_Driver/src/RawBlockWrite.h
+++ b/MAC/APL/PIC/RSP_Driver/src/RawBlockWrite.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/RawEvent.cc b/MAC/APL/PIC/RSP_Driver/src/RawEvent.cc
index d7f02f3654d..c68bf1ab898 100644
--- a/MAC/APL/PIC/RSP_Driver/src/RawEvent.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/RawEvent.cc
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/RawEvent.h b/MAC/APL/PIC/RSP_Driver/src/RawEvent.h
index 4a4af8755c0..d77b7f76bcb 100644
--- a/MAC/APL/PIC/RSP_Driver/src/RawEvent.h
+++ b/MAC/APL/PIC/RSP_Driver/src/RawEvent.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/ReadHBACmd.cc b/MAC/APL/PIC/RSP_Driver/src/ReadHBACmd.cc
index 577bd922441..4e85bc7f6b2 100644
--- a/MAC/APL/PIC/RSP_Driver/src/ReadHBACmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/ReadHBACmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2008
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/ReadHBACmd.h b/MAC/APL/PIC/RSP_Driver/src/ReadHBACmd.h
index be4cbd505a4..084cd863847 100644
--- a/MAC/APL/PIC/RSP_Driver/src/ReadHBACmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/ReadHBACmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2008
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/ReadReg.cc b/MAC/APL/PIC/RSP_Driver/src/ReadReg.cc
index f006dbc41a4..9c20b7357b6 100644
--- a/MAC/APL/PIC/RSP_Driver/src/ReadReg.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/ReadReg.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/ReadReg.h b/MAC/APL/PIC/RSP_Driver/src/ReadReg.h
index 815837fa654..08f96593336 100644
--- a/MAC/APL/PIC/RSP_Driver/src/ReadReg.h
+++ b/MAC/APL/PIC/RSP_Driver/src/ReadReg.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/RefCount.h b/MAC/APL/PIC/RSP_Driver/src/RefCount.h
index 182245f2fcc..0c2820a28c1 100644
--- a/MAC/APL/PIC/RSP_Driver/src/RefCount.h
+++ b/MAC/APL/PIC/RSP_Driver/src/RefCount.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SDOModeRead.cc b/MAC/APL/PIC/RSP_Driver/src/SDOModeRead.cc
index aff37a868c4..1846c09ed98 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SDOModeRead.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/SDOModeRead.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SDOModeRead.h b/MAC/APL/PIC/RSP_Driver/src/SDOModeRead.h
index ff6d44cc623..dd8657560fa 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SDOModeRead.h
+++ b/MAC/APL/PIC/RSP_Driver/src/SDOModeRead.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SDOModeWrite.cc b/MAC/APL/PIC/RSP_Driver/src/SDOModeWrite.cc
index 1f6d2e94f1f..2400342b2e9 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SDOModeWrite.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/SDOModeWrite.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SDOModeWrite.h b/MAC/APL/PIC/RSP_Driver/src/SDOModeWrite.h
index 74947269237..494171b6752 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SDOModeWrite.h
+++ b/MAC/APL/PIC/RSP_Driver/src/SDOModeWrite.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SDORead.cc b/MAC/APL/PIC/RSP_Driver/src/SDORead.cc
index fda0c7e3d0a..a8913c3bfb3 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SDORead.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/SDORead.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SDORead.h b/MAC/APL/PIC/RSP_Driver/src/SDORead.h
index 36738fd0a3e..99ffb350d80 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SDORead.h
+++ b/MAC/APL/PIC/RSP_Driver/src/SDORead.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SDOWrite.cc b/MAC/APL/PIC/RSP_Driver/src/SDOWrite.cc
index c6bb5e07fa0..c1048fd5ee1 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SDOWrite.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/SDOWrite.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SDOWrite.h b/MAC/APL/PIC/RSP_Driver/src/SDOWrite.h
index c54ce060002..6f23b201891 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SDOWrite.h
+++ b/MAC/APL/PIC/RSP_Driver/src/SDOWrite.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SSRead.cc b/MAC/APL/PIC/RSP_Driver/src/SSRead.cc
index 5ec208b33f0..5b34bee87c0 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SSRead.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/SSRead.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SSRead.h b/MAC/APL/PIC/RSP_Driver/src/SSRead.h
index e7f86498942..a0e7ed4e6d7 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SSRead.h
+++ b/MAC/APL/PIC/RSP_Driver/src/SSRead.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SSWrite.cc b/MAC/APL/PIC/RSP_Driver/src/SSWrite.cc
index c209e486774..b6d2638f301 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SSWrite.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/SSWrite.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SSWrite.h b/MAC/APL/PIC/RSP_Driver/src/SSWrite.h
index 4d14c3b14d7..2e93972d6a6 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SSWrite.h
+++ b/MAC/APL/PIC/RSP_Driver/src/SSWrite.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/Scheduler.cc b/MAC/APL/PIC/RSP_Driver/src/Scheduler.cc
index bfbf09d3e69..d7d47622f41 100644
--- a/MAC/APL/PIC/RSP_Driver/src/Scheduler.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/Scheduler.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/Scheduler.h b/MAC/APL/PIC/RSP_Driver/src/Scheduler.h
index 7035f13812a..23d0291ee4c 100644
--- a/MAC/APL/PIC/RSP_Driver/src/Scheduler.h
+++ b/MAC/APL/PIC/RSP_Driver/src/Scheduler.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2009
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/Sequencer.cc b/MAC/APL/PIC/RSP_Driver/src/Sequencer.cc
index bc390dfb51e..228c5d6a127 100644
--- a/MAC/APL/PIC/RSP_Driver/src/Sequencer.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/Sequencer.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/Sequencer.h b/MAC/APL/PIC/RSP_Driver/src/Sequencer.h
index a7e5f112d06..4ea7cd39431 100644
--- a/MAC/APL/PIC/RSP_Driver/src/Sequencer.h
+++ b/MAC/APL/PIC/RSP_Driver/src/Sequencer.h
@@ -5,7 +5,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SerdesBuffer.cc b/MAC/APL/PIC/RSP_Driver/src/SerdesBuffer.cc
index 23ca772cb02..4cfa655fd32 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SerdesBuffer.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/SerdesBuffer.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SerdesBuffer.h b/MAC/APL/PIC/RSP_Driver/src/SerdesBuffer.h
index 7817b01a675..3c3ccf367de 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SerdesBuffer.h
+++ b/MAC/APL/PIC/RSP_Driver/src/SerdesBuffer.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SerdesRead.cc b/MAC/APL/PIC/RSP_Driver/src/SerdesRead.cc
index 93c73509b19..c8f8f572172 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SerdesRead.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/SerdesRead.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2009
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SerdesRead.h b/MAC/APL/PIC/RSP_Driver/src/SerdesRead.h
index 1cd1f57e9d0..78af2a2b20c 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SerdesRead.h
+++ b/MAC/APL/PIC/RSP_Driver/src/SerdesRead.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2009
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SerdesWrite.cc b/MAC/APL/PIC/RSP_Driver/src/SerdesWrite.cc
index 8bc457d91ec..872a611f667 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SerdesWrite.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/SerdesWrite.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2009
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SerdesWrite.h b/MAC/APL/PIC/RSP_Driver/src/SerdesWrite.h
index 7d4af4280c3..d340f72f639 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SerdesWrite.h
+++ b/MAC/APL/PIC/RSP_Driver/src/SerdesWrite.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2009
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetBitModeCmd.cc b/MAC/APL/PIC/RSP_Driver/src/SetBitModeCmd.cc
index 69a22a63963..f7dc3488fd1 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetBitModeCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/SetBitModeCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetBitModeCmd.h b/MAC/APL/PIC/RSP_Driver/src/SetBitModeCmd.h
index a4b322ac73a..1984e4dc596 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetBitModeCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/SetBitModeCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetBypassCmd.cc b/MAC/APL/PIC/RSP_Driver/src/SetBypassCmd.cc
index 071a932d66d..5f6043ed375 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetBypassCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/SetBypassCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetBypassCmd.h b/MAC/APL/PIC/RSP_Driver/src/SetBypassCmd.h
index 422ead55f8e..10471b0dac2 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetBypassCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/SetBypassCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetClocksCmd.cc b/MAC/APL/PIC/RSP_Driver/src/SetClocksCmd.cc
index da927df2e6d..fd27aaa6bfa 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetClocksCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/SetClocksCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetClocksCmd.h b/MAC/APL/PIC/RSP_Driver/src/SetClocksCmd.h
index 3625cf87383..0629190dc74 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetClocksCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/SetClocksCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetDatastreamCmd.cc b/MAC/APL/PIC/RSP_Driver/src/SetDatastreamCmd.cc
index 60420741439..988b35c6a82 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetDatastreamCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/SetDatastreamCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2009
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetDatastreamCmd.h b/MAC/APL/PIC/RSP_Driver/src/SetDatastreamCmd.h
index 6aa7b15f573..f5cf0d26894 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetDatastreamCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/SetDatastreamCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2009
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetHBACmd.cc b/MAC/APL/PIC/RSP_Driver/src/SetHBACmd.cc
index 2e2e8dac784..c193080e7d4 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetHBACmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/SetHBACmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetHBACmd.h b/MAC/APL/PIC/RSP_Driver/src/SetHBACmd.h
index 6f2cde743d2..bbac8753720 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetHBACmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/SetHBACmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetRCUCmd.cc b/MAC/APL/PIC/RSP_Driver/src/SetRCUCmd.cc
index 8dc8a920fbc..6ee344cec72 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetRCUCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/SetRCUCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetRCUCmd.h b/MAC/APL/PIC/RSP_Driver/src/SetRCUCmd.h
index 972bbbcb423..3805c90f922 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetRCUCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/SetRCUCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetRSUCmd.cc b/MAC/APL/PIC/RSP_Driver/src/SetRSUCmd.cc
index 7e3bb409902..81b144f9ca8 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetRSUCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/SetRSUCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetRSUCmd.h b/MAC/APL/PIC/RSP_Driver/src/SetRSUCmd.h
index 4244ed243ef..c0da944bc6b 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetRSUCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/SetRSUCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetRawBlockCmd.cc b/MAC/APL/PIC/RSP_Driver/src/SetRawBlockCmd.cc
index 3307352dc6c..c9417423240 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetRawBlockCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/SetRawBlockCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2008
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetRawBlockCmd.h b/MAC/APL/PIC/RSP_Driver/src/SetRawBlockCmd.h
index c3fc88e4776..4ba74f335e7 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetRawBlockCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/SetRawBlockCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2008
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetSDOCmd.cc b/MAC/APL/PIC/RSP_Driver/src/SetSDOCmd.cc
index 4b0df93dabe..cf49ef30ffe 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetSDOCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/SetSDOCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetSDOCmd.h b/MAC/APL/PIC/RSP_Driver/src/SetSDOCmd.h
index a32d2566d29..8bf954172bc 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetSDOCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/SetSDOCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetSDOModeCmd.cc b/MAC/APL/PIC/RSP_Driver/src/SetSDOModeCmd.cc
index 4c4cd9cc26b..c2022a5119c 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetSDOModeCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/SetSDOModeCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetSDOModeCmd.h b/MAC/APL/PIC/RSP_Driver/src/SetSDOModeCmd.h
index e8197cd2794..0d3a35bf9c0 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetSDOModeCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/SetSDOModeCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetSplitterCmd.cc b/MAC/APL/PIC/RSP_Driver/src/SetSplitterCmd.cc
index 5f9bfad28b2..f6352eabedc 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetSplitterCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/SetSplitterCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2009
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetSplitterCmd.h b/MAC/APL/PIC/RSP_Driver/src/SetSplitterCmd.h
index 1bb1bc1622f..a6162af431a 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetSplitterCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/SetSplitterCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2009
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetSubbandsCmd.cc b/MAC/APL/PIC/RSP_Driver/src/SetSubbandsCmd.cc
index 51e3c9bf711..2ce7473ea6a 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetSubbandsCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/SetSubbandsCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetSubbandsCmd.h b/MAC/APL/PIC/RSP_Driver/src/SetSubbandsCmd.h
index 8c49a01c78b..537240b93aa 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetSubbandsCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/SetSubbandsCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetSwapxyCmd.cc b/MAC/APL/PIC/RSP_Driver/src/SetSwapxyCmd.cc
index fb9e57ffc97..53aac529317 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetSwapxyCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/SetSwapxyCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetSwapxyCmd.h b/MAC/APL/PIC/RSP_Driver/src/SetSwapxyCmd.h
index 27753e4533c..b3a14838f86 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetSwapxyCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/SetSwapxyCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetTBBCmd.cc b/MAC/APL/PIC/RSP_Driver/src/SetTBBCmd.cc
index 14d33fac58c..5c46f23d1a4 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetTBBCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/SetTBBCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetTBBCmd.h b/MAC/APL/PIC/RSP_Driver/src/SetTBBCmd.h
index 7a92875e805..7d0b268cfb4 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetTBBCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/SetTBBCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetWGCmd.cc b/MAC/APL/PIC/RSP_Driver/src/SetWGCmd.cc
index ae38870fd31..7e65d868485 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetWGCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/SetWGCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetWGCmd.h b/MAC/APL/PIC/RSP_Driver/src/SetWGCmd.h
index 3c6268b925a..dd0b80ac1d3 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetWGCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/SetWGCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetWeightsCmd.cc b/MAC/APL/PIC/RSP_Driver/src/SetWeightsCmd.cc
index 86a5466ebc1..8907dac82f8 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetWeightsCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/SetWeightsCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SetWeightsCmd.h b/MAC/APL/PIC/RSP_Driver/src/SetWeightsCmd.h
index 5f9801a5d7c..053ae1802f1 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SetWeightsCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/SetWeightsCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SstRead.cc b/MAC/APL/PIC/RSP_Driver/src/SstRead.cc
index 62f785d38d8..2fb5f22c955 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SstRead.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/SstRead.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SstRead.h b/MAC/APL/PIC/RSP_Driver/src/SstRead.h
index 97d18a4b463..177c70ed99f 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SstRead.h
+++ b/MAC/APL/PIC/RSP_Driver/src/SstRead.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/StationSettings.cc b/MAC/APL/PIC/RSP_Driver/src/StationSettings.cc
index dd319285be6..6d7dc4f1605 100644
--- a/MAC/APL/PIC/RSP_Driver/src/StationSettings.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/StationSettings.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/StationSettings.h b/MAC/APL/PIC/RSP_Driver/src/StationSettings.h
index 49dabebc415..8d38cc1592b 100644
--- a/MAC/APL/PIC/RSP_Driver/src/StationSettings.h
+++ b/MAC/APL/PIC/RSP_Driver/src/StationSettings.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/StatusRead.cc b/MAC/APL/PIC/RSP_Driver/src/StatusRead.cc
index 4f97904165a..ce817df65ed 100644
--- a/MAC/APL/PIC/RSP_Driver/src/StatusRead.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/StatusRead.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/StatusRead.h b/MAC/APL/PIC/RSP_Driver/src/StatusRead.h
index b0deb477f96..f26f4ef3dc1 100644
--- a/MAC/APL/PIC/RSP_Driver/src/StatusRead.h
+++ b/MAC/APL/PIC/RSP_Driver/src/StatusRead.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SyncAction.cc b/MAC/APL/PIC/RSP_Driver/src/SyncAction.cc
index 2c1c9efd0d6..3398a694c80 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SyncAction.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/SyncAction.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/SyncAction.h b/MAC/APL/PIC/RSP_Driver/src/SyncAction.h
index c8f97d8c4ba..e9e6f21d429 100644
--- a/MAC/APL/PIC/RSP_Driver/src/SyncAction.h
+++ b/MAC/APL/PIC/RSP_Driver/src/SyncAction.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/TBBBandselWrite.cc b/MAC/APL/PIC/RSP_Driver/src/TBBBandselWrite.cc
index b1fafd196e7..94ba61b62ae 100644
--- a/MAC/APL/PIC/RSP_Driver/src/TBBBandselWrite.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/TBBBandselWrite.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/TBBBandselWrite.h b/MAC/APL/PIC/RSP_Driver/src/TBBBandselWrite.h
index c6dfae6a28b..69de1cce0c3 100644
--- a/MAC/APL/PIC/RSP_Driver/src/TBBBandselWrite.h
+++ b/MAC/APL/PIC/RSP_Driver/src/TBBBandselWrite.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/TBBSettingsWrite.cc b/MAC/APL/PIC/RSP_Driver/src/TBBSettingsWrite.cc
index 66871e76d5a..58136928382 100644
--- a/MAC/APL/PIC/RSP_Driver/src/TBBSettingsWrite.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/TBBSettingsWrite.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/TBBSettingsWrite.h b/MAC/APL/PIC/RSP_Driver/src/TBBSettingsWrite.h
index 5f27f637aa6..c7711d67a33 100644
--- a/MAC/APL/PIC/RSP_Driver/src/TBBSettingsWrite.h
+++ b/MAC/APL/PIC/RSP_Driver/src/TBBSettingsWrite.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/TDSProtocolWrite.cc b/MAC/APL/PIC/RSP_Driver/src/TDSProtocolWrite.cc
index ae714c4307a..99fbde0cb09 100644
--- a/MAC/APL/PIC/RSP_Driver/src/TDSProtocolWrite.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/TDSProtocolWrite.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/TDSProtocolWrite.h b/MAC/APL/PIC/RSP_Driver/src/TDSProtocolWrite.h
index d4407aadd1e..f217fc6983a 100644
--- a/MAC/APL/PIC/RSP_Driver/src/TDSProtocolWrite.h
+++ b/MAC/APL/PIC/RSP_Driver/src/TDSProtocolWrite.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/TDSResultRead.cc b/MAC/APL/PIC/RSP_Driver/src/TDSResultRead.cc
index 12d59971ecb..d047aa7fb81 100644
--- a/MAC/APL/PIC/RSP_Driver/src/TDSResultRead.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/TDSResultRead.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/TDSResultRead.h b/MAC/APL/PIC/RSP_Driver/src/TDSResultRead.h
index fb72528fbf4..af031519e4f 100644
--- a/MAC/APL/PIC/RSP_Driver/src/TDSResultRead.h
+++ b/MAC/APL/PIC/RSP_Driver/src/TDSResultRead.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/TDSResultWrite.cc b/MAC/APL/PIC/RSP_Driver/src/TDSResultWrite.cc
index 4c63b59629e..1cf72ef5c5a 100644
--- a/MAC/APL/PIC/RSP_Driver/src/TDSResultWrite.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/TDSResultWrite.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/TDSResultWrite.h b/MAC/APL/PIC/RSP_Driver/src/TDSResultWrite.h
index ec479f8b135..a1ec1407fe7 100644
--- a/MAC/APL/PIC/RSP_Driver/src/TDSResultWrite.h
+++ b/MAC/APL/PIC/RSP_Driver/src/TDSResultWrite.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/TDSStatusRead.cc b/MAC/APL/PIC/RSP_Driver/src/TDSStatusRead.cc
index f15c839fb4e..4c5f9337c8a 100644
--- a/MAC/APL/PIC/RSP_Driver/src/TDSStatusRead.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/TDSStatusRead.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/TDSStatusRead.h b/MAC/APL/PIC/RSP_Driver/src/TDSStatusRead.h
index 4f15fca0995..d4126ad3cc3 100644
--- a/MAC/APL/PIC/RSP_Driver/src/TDSStatusRead.h
+++ b/MAC/APL/PIC/RSP_Driver/src/TDSStatusRead.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/TDSStatusWrite.cc b/MAC/APL/PIC/RSP_Driver/src/TDSStatusWrite.cc
index 773ff801725..731c380b061 100644
--- a/MAC/APL/PIC/RSP_Driver/src/TDSStatusWrite.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/TDSStatusWrite.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/TDSStatusWrite.h b/MAC/APL/PIC/RSP_Driver/src/TDSStatusWrite.h
index ec2388df95d..e2c72720a98 100644
--- a/MAC/APL/PIC/RSP_Driver/src/TDSStatusWrite.h
+++ b/MAC/APL/PIC/RSP_Driver/src/TDSStatusWrite.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/TDSi2cdefs.h b/MAC/APL/PIC/RSP_Driver/src/TDSi2cdefs.h
index aff9a79d53c..b9413b545a9 100644
--- a/MAC/APL/PIC/RSP_Driver/src/TDSi2cdefs.h
+++ b/MAC/APL/PIC/RSP_Driver/src/TDSi2cdefs.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/TimestampWrite.cc b/MAC/APL/PIC/RSP_Driver/src/TimestampWrite.cc
index c903fc8ebeb..26e08d0a22e 100644
--- a/MAC/APL/PIC/RSP_Driver/src/TimestampWrite.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/TimestampWrite.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/TimestampWrite.h b/MAC/APL/PIC/RSP_Driver/src/TimestampWrite.h
index 7ac4f85b314..56e1e007858 100644
--- a/MAC/APL/PIC/RSP_Driver/src/TimestampWrite.h
+++ b/MAC/APL/PIC/RSP_Driver/src/TimestampWrite.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/UpdBitModeCmd.cc b/MAC/APL/PIC/RSP_Driver/src/UpdBitModeCmd.cc
index ce7ba2295ef..9655a33ed62 100644
--- a/MAC/APL/PIC/RSP_Driver/src/UpdBitModeCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/UpdBitModeCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/UpdBitModeCmd.h b/MAC/APL/PIC/RSP_Driver/src/UpdBitModeCmd.h
index 99ef4331301..78223d56e80 100644
--- a/MAC/APL/PIC/RSP_Driver/src/UpdBitModeCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/UpdBitModeCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/UpdClocksCmd.cc b/MAC/APL/PIC/RSP_Driver/src/UpdClocksCmd.cc
index de366f1fc76..eb77d85aa1b 100644
--- a/MAC/APL/PIC/RSP_Driver/src/UpdClocksCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/UpdClocksCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/UpdClocksCmd.h b/MAC/APL/PIC/RSP_Driver/src/UpdClocksCmd.h
index 82a62c416c7..ee5b282a044 100644
--- a/MAC/APL/PIC/RSP_Driver/src/UpdClocksCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/UpdClocksCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/UpdHBACmd.cc b/MAC/APL/PIC/RSP_Driver/src/UpdHBACmd.cc
index 0ba84a806cc..4589acd10bb 100644
--- a/MAC/APL/PIC/RSP_Driver/src/UpdHBACmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/UpdHBACmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/UpdHBACmd.h b/MAC/APL/PIC/RSP_Driver/src/UpdHBACmd.h
index e7b14437761..dca72d593f8 100644
--- a/MAC/APL/PIC/RSP_Driver/src/UpdHBACmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/UpdHBACmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/UpdRCUCmd.cc b/MAC/APL/PIC/RSP_Driver/src/UpdRCUCmd.cc
index 61f1c4b073f..845b0b1a35a 100644
--- a/MAC/APL/PIC/RSP_Driver/src/UpdRCUCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/UpdRCUCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/UpdRCUCmd.h b/MAC/APL/PIC/RSP_Driver/src/UpdRCUCmd.h
index bdab1f3d827..fe09b06a661 100644
--- a/MAC/APL/PIC/RSP_Driver/src/UpdRCUCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/UpdRCUCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/UpdRegisterStateCmd.cc b/MAC/APL/PIC/RSP_Driver/src/UpdRegisterStateCmd.cc
index c8408ceb852..6bf4f6aa2a2 100644
--- a/MAC/APL/PIC/RSP_Driver/src/UpdRegisterStateCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/UpdRegisterStateCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/UpdRegisterStateCmd.h b/MAC/APL/PIC/RSP_Driver/src/UpdRegisterStateCmd.h
index c0acb0542be..8b362e6301a 100644
--- a/MAC/APL/PIC/RSP_Driver/src/UpdRegisterStateCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/UpdRegisterStateCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/UpdSplitterCmd.cc b/MAC/APL/PIC/RSP_Driver/src/UpdSplitterCmd.cc
index c45c0a87f85..f301e07caad 100644
--- a/MAC/APL/PIC/RSP_Driver/src/UpdSplitterCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/UpdSplitterCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2009
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/UpdSplitterCmd.h b/MAC/APL/PIC/RSP_Driver/src/UpdSplitterCmd.h
index d0d19401dd9..c1a3f80ad28 100644
--- a/MAC/APL/PIC/RSP_Driver/src/UpdSplitterCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/UpdSplitterCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2009
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/UpdStatsCmd.cc b/MAC/APL/PIC/RSP_Driver/src/UpdStatsCmd.cc
index a4043280e49..3a107556f9b 100644
--- a/MAC/APL/PIC/RSP_Driver/src/UpdStatsCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/UpdStatsCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/UpdStatsCmd.h b/MAC/APL/PIC/RSP_Driver/src/UpdStatsCmd.h
index 42ff37f7402..c4616a2d95b 100644
--- a/MAC/APL/PIC/RSP_Driver/src/UpdStatsCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/UpdStatsCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/UpdStatusCmd.cc b/MAC/APL/PIC/RSP_Driver/src/UpdStatusCmd.cc
index 5f124838366..8c3d41bcf1e 100644
--- a/MAC/APL/PIC/RSP_Driver/src/UpdStatusCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/UpdStatusCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/UpdStatusCmd.h b/MAC/APL/PIC/RSP_Driver/src/UpdStatusCmd.h
index 984f75e1678..0609137ad4f 100644
--- a/MAC/APL/PIC/RSP_Driver/src/UpdStatusCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/UpdStatusCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/UpdSubbandsCmd.cc b/MAC/APL/PIC/RSP_Driver/src/UpdSubbandsCmd.cc
index 712b455b5b6..82c179f93d6 100644
--- a/MAC/APL/PIC/RSP_Driver/src/UpdSubbandsCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/UpdSubbandsCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/UpdSubbandsCmd.h b/MAC/APL/PIC/RSP_Driver/src/UpdSubbandsCmd.h
index 7b911324306..8c9788dcd52 100644
--- a/MAC/APL/PIC/RSP_Driver/src/UpdSubbandsCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/UpdSubbandsCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/UpdTDStatusCmd.cc b/MAC/APL/PIC/RSP_Driver/src/UpdTDStatusCmd.cc
index 2842f900158..4164f1cf5d4 100644
--- a/MAC/APL/PIC/RSP_Driver/src/UpdTDStatusCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/UpdTDStatusCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/UpdTDStatusCmd.h b/MAC/APL/PIC/RSP_Driver/src/UpdTDStatusCmd.h
index d43d713e9b9..215b0bc8d77 100644
--- a/MAC/APL/PIC/RSP_Driver/src/UpdTDStatusCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/UpdTDStatusCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/UpdXCStatsCmd.cc b/MAC/APL/PIC/RSP_Driver/src/UpdXCStatsCmd.cc
index 4a56db976f4..45c21ee3b6f 100644
--- a/MAC/APL/PIC/RSP_Driver/src/UpdXCStatsCmd.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/UpdXCStatsCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/UpdXCStatsCmd.h b/MAC/APL/PIC/RSP_Driver/src/UpdXCStatsCmd.h
index d7d9f61b990..4882e4a8ce3 100644
--- a/MAC/APL/PIC/RSP_Driver/src/UpdXCStatsCmd.h
+++ b/MAC/APL/PIC/RSP_Driver/src/UpdXCStatsCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/VersionsRead.cc b/MAC/APL/PIC/RSP_Driver/src/VersionsRead.cc
index 00c4cf7caa8..438732b3843 100644
--- a/MAC/APL/PIC/RSP_Driver/src/VersionsRead.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/VersionsRead.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/VersionsRead.h b/MAC/APL/PIC/RSP_Driver/src/VersionsRead.h
index 71898afdab5..9d048512429 100644
--- a/MAC/APL/PIC/RSP_Driver/src/VersionsRead.h
+++ b/MAC/APL/PIC/RSP_Driver/src/VersionsRead.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/WGRead.cc b/MAC/APL/PIC/RSP_Driver/src/WGRead.cc
index 145e778e26d..3c79093958a 100644
--- a/MAC/APL/PIC/RSP_Driver/src/WGRead.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/WGRead.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/WGRead.h b/MAC/APL/PIC/RSP_Driver/src/WGRead.h
index ce1cdec87e7..831b3c12512 100644
--- a/MAC/APL/PIC/RSP_Driver/src/WGRead.h
+++ b/MAC/APL/PIC/RSP_Driver/src/WGRead.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/WGWrite.cc b/MAC/APL/PIC/RSP_Driver/src/WGWrite.cc
index f00b82de3be..fe3f55f5ef1 100644
--- a/MAC/APL/PIC/RSP_Driver/src/WGWrite.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/WGWrite.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/WGWrite.h b/MAC/APL/PIC/RSP_Driver/src/WGWrite.h
index f33fbf86998..92b02a5cd48 100644
--- a/MAC/APL/PIC/RSP_Driver/src/WGWrite.h
+++ b/MAC/APL/PIC/RSP_Driver/src/WGWrite.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/WriteReg.cc b/MAC/APL/PIC/RSP_Driver/src/WriteReg.cc
index 5d07180ae38..e14e96792d6 100644
--- a/MAC/APL/PIC/RSP_Driver/src/WriteReg.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/WriteReg.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/WriteReg.h b/MAC/APL/PIC/RSP_Driver/src/WriteReg.h
index 4f166a7f34d..45d97d627d9 100644
--- a/MAC/APL/PIC/RSP_Driver/src/WriteReg.h
+++ b/MAC/APL/PIC/RSP_Driver/src/WriteReg.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/XWWrite.cc b/MAC/APL/PIC/RSP_Driver/src/XWWrite.cc
index 020885f58f0..cb0199bc025 100644
--- a/MAC/APL/PIC/RSP_Driver/src/XWWrite.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/XWWrite.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/XWWrite.h b/MAC/APL/PIC/RSP_Driver/src/XWWrite.h
index 605b96a2772..f6c77ff3004 100644
--- a/MAC/APL/PIC/RSP_Driver/src/XWWrite.h
+++ b/MAC/APL/PIC/RSP_Driver/src/XWWrite.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/XstRead.cc b/MAC/APL/PIC/RSP_Driver/src/XstRead.cc
index fff42405290..59938472ef2 100644
--- a/MAC/APL/PIC/RSP_Driver/src/XstRead.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/XstRead.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/XstRead.h b/MAC/APL/PIC/RSP_Driver/src/XstRead.h
index 4cd934c9bca..2e43cf653bc 100644
--- a/MAC/APL/PIC/RSP_Driver/src/XstRead.h
+++ b/MAC/APL/PIC/RSP_Driver/src/XstRead.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/rspctl.cc b/MAC/APL/PIC/RSP_Driver/src/rspctl.cc
index 7cd4b604a2b..0a6c9a1b00c 100644
--- a/MAC/APL/PIC/RSP_Driver/src/rspctl.cc
+++ b/MAC/APL/PIC/RSP_Driver/src/rspctl.cc
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/rspctl.h b/MAC/APL/PIC/RSP_Driver/src/rspctl.h
index ba8a26a2845..049dc5c2a5c 100644
--- a/MAC/APL/PIC/RSP_Driver/src/rspctl.h
+++ b/MAC/APL/PIC/RSP_Driver/src/rspctl.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/src/rspd.ul.in b/MAC/APL/PIC/RSP_Driver/src/rspd.ul.in
index b06c9817ecd..f006b8e9079 100644
--- a/MAC/APL/PIC/RSP_Driver/src/rspd.ul.in
+++ b/MAC/APL/PIC/RSP_Driver/src/rspd.ul.in
@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2003
 # ASTRON (Netherlands Foundation for Research in Astronomy)
-# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/test/EPAStub.cc b/MAC/APL/PIC/RSP_Driver/test/EPAStub.cc
index b792a6f1d1b..445b5df844d 100644
--- a/MAC/APL/PIC/RSP_Driver/test/EPAStub.cc
+++ b/MAC/APL/PIC/RSP_Driver/test/EPAStub.cc
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/test/EPAStub.h b/MAC/APL/PIC/RSP_Driver/test/EPAStub.h
index c08c32d7abe..2871c0cb813 100644
--- a/MAC/APL/PIC/RSP_Driver/test/EPAStub.h
+++ b/MAC/APL/PIC/RSP_Driver/test/EPAStub.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/test/RSPTest.cc b/MAC/APL/PIC/RSP_Driver/test/RSPTest.cc
index 4cadff8edd9..a9f3e3b2067 100644
--- a/MAC/APL/PIC/RSP_Driver/test/RSPTest.cc
+++ b/MAC/APL/PIC/RSP_Driver/test/RSPTest.cc
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/test/RSPTest.h b/MAC/APL/PIC/RSP_Driver/test/RSPTest.h
index 1ff6bf35791..76c8c9532d0 100644
--- a/MAC/APL/PIC/RSP_Driver/test/RSPTest.h
+++ b/MAC/APL/PIC/RSP_Driver/test/RSPTest.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/test/RSPTestSuite.h b/MAC/APL/PIC/RSP_Driver/test/RSPTestSuite.h
index 872aa7add80..de958deba4b 100644
--- a/MAC/APL/PIC/RSP_Driver/test/RSPTestSuite.h
+++ b/MAC/APL/PIC/RSP_Driver/test/RSPTestSuite.h
@@ -5,7 +5,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/test/tCableAttenuation.cc b/MAC/APL/PIC/RSP_Driver/test/tCableAttenuation.cc
index c713949a6f7..6e13bdd3dd2 100644
--- a/MAC/APL/PIC/RSP_Driver/test/tCableAttenuation.cc
+++ b/MAC/APL/PIC/RSP_Driver/test/tCableAttenuation.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2009
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Driver/test/tRCUCables.cc b/MAC/APL/PIC/RSP_Driver/test/tRCUCables.cc
index 77f8040944a..710592cc0b7 100644
--- a/MAC/APL/PIC/RSP_Driver/test/tRCUCables.cc
+++ b/MAC/APL/PIC/RSP_Driver/test/tRCUCables.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2009
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/AllRegisterState.h b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/AllRegisterState.h
index 56ad7e7e966..0e673274120 100644
--- a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/AllRegisterState.h
+++ b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/AllRegisterState.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/BeamletWeights.h b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/BeamletWeights.h
index ead025fed00..3a4490ddd96 100644
--- a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/BeamletWeights.h
+++ b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/BeamletWeights.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/Bitmode.h b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/Bitmode.h
index 3540baf31be..931cb954c1e 100644
--- a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/Bitmode.h
+++ b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/Bitmode.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/BypassSettings.h b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/BypassSettings.h
index aa63e5c6db9..b7ca02e17ce 100644
--- a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/BypassSettings.h
+++ b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/BypassSettings.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/HBASettings.h b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/HBASettings.h
index df19c5d1bde..7339e710825 100644
--- a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/HBASettings.h
+++ b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/HBASettings.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/Latency.h b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/Latency.h
index 3016483f69f..e4a77f31026 100644
--- a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/Latency.h
+++ b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/Latency.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/MEPData.h b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/MEPData.h
index 1eb9afe7d33..fa51d71ed4f 100644
--- a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/MEPData.h
+++ b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/MEPData.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/MEPHeader.h b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/MEPHeader.h
index 4959f98c571..11f188a0f67 100644
--- a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/MEPHeader.h
+++ b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/MEPHeader.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/RCUSettings.h b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/RCUSettings.h
index 5c882fddec7..bea7241826b 100644
--- a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/RCUSettings.h
+++ b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/RCUSettings.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/RSUSettings.h b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/RSUSettings.h
index e2c9905fd70..3f445c74642 100644
--- a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/RSUSettings.h
+++ b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/RSUSettings.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/SDOMode.h b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/SDOMode.h
index 0c6eef0a209..922fdd3008d 100644
--- a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/SDOMode.h
+++ b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/SDOMode.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/SDOSelection.h b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/SDOSelection.h
index e962d7c7830..38dde382d93 100644
--- a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/SDOSelection.h
+++ b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/SDOSelection.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/SPUStatus.h b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/SPUStatus.h
index 172762c4df3..5b65f7ce0cb 100644
--- a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/SPUStatus.h
+++ b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/SPUStatus.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2008
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/Statistics.h b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/Statistics.h
index f4769f42bee..3c38d83533d 100644
--- a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/Statistics.h
+++ b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/Statistics.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/SubbandSelection.h b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/SubbandSelection.h
index d06d32fddbe..e40e8771190 100644
--- a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/SubbandSelection.h
+++ b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/SubbandSelection.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/SystemStatus.h b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/SystemStatus.h
index 33881a17897..9c248c021ff 100644
--- a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/SystemStatus.h
+++ b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/SystemStatus.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/TBBSettings.h b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/TBBSettings.h
index 26f64ec8f72..3cec2e122e6 100644
--- a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/TBBSettings.h
+++ b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/TBBSettings.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/TDStatus.h b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/TDStatus.h
index 2b8c60504a5..c3b0785ef49 100644
--- a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/TDStatus.h
+++ b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/TDStatus.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/Versions.h b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/Versions.h
index 63c1210ba1c..9701c647485 100644
--- a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/Versions.h
+++ b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/Versions.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/WGSettings.h b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/WGSettings.h
index 06fbc6f7611..7fc6f9bf37f 100644
--- a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/WGSettings.h
+++ b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/WGSettings.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/XCStatistics.h b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/XCStatistics.h
index dfc99064882..d6e37c26f4e 100644
--- a/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/XCStatistics.h
+++ b/MAC/APL/PIC/RSP_Protocol/include/APL/RSP_Protocol/XCStatistics.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/src/AllRegisterState.cc b/MAC/APL/PIC/RSP_Protocol/src/AllRegisterState.cc
index 0a9828e9ecd..e731c808dc8 100644
--- a/MAC/APL/PIC/RSP_Protocol/src/AllRegisterState.cc
+++ b/MAC/APL/PIC/RSP_Protocol/src/AllRegisterState.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/src/BeamletWeights.cc b/MAC/APL/PIC/RSP_Protocol/src/BeamletWeights.cc
index 6353876de2f..4f40d20d7f9 100644
--- a/MAC/APL/PIC/RSP_Protocol/src/BeamletWeights.cc
+++ b/MAC/APL/PIC/RSP_Protocol/src/BeamletWeights.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/src/Bitmode.cc b/MAC/APL/PIC/RSP_Protocol/src/Bitmode.cc
index 768cccba3e6..1c3e2467d2d 100644
--- a/MAC/APL/PIC/RSP_Protocol/src/Bitmode.cc
+++ b/MAC/APL/PIC/RSP_Protocol/src/Bitmode.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/src/BypassSettings.cc b/MAC/APL/PIC/RSP_Protocol/src/BypassSettings.cc
index c541468c006..561b8c37763 100644
--- a/MAC/APL/PIC/RSP_Protocol/src/BypassSettings.cc
+++ b/MAC/APL/PIC/RSP_Protocol/src/BypassSettings.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/src/HBASettings.cc b/MAC/APL/PIC/RSP_Protocol/src/HBASettings.cc
index 15711809913..d8d2160bf97 100644
--- a/MAC/APL/PIC/RSP_Protocol/src/HBASettings.cc
+++ b/MAC/APL/PIC/RSP_Protocol/src/HBASettings.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/src/Latency.cc b/MAC/APL/PIC/RSP_Protocol/src/Latency.cc
index ff17619d5c9..6bea7d41104 100644
--- a/MAC/APL/PIC/RSP_Protocol/src/Latency.cc
+++ b/MAC/APL/PIC/RSP_Protocol/src/Latency.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/src/MEPData.cc b/MAC/APL/PIC/RSP_Protocol/src/MEPData.cc
index d472a08c6f3..e7451ba8883 100644
--- a/MAC/APL/PIC/RSP_Protocol/src/MEPData.cc
+++ b/MAC/APL/PIC/RSP_Protocol/src/MEPData.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/src/MEPHeader.cc b/MAC/APL/PIC/RSP_Protocol/src/MEPHeader.cc
index 56de078e88a..ed4f71d4382 100644
--- a/MAC/APL/PIC/RSP_Protocol/src/MEPHeader.cc
+++ b/MAC/APL/PIC/RSP_Protocol/src/MEPHeader.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/src/RCUSettings.cc b/MAC/APL/PIC/RSP_Protocol/src/RCUSettings.cc
index b3aa0a8eaba..8fed669ff65 100644
--- a/MAC/APL/PIC/RSP_Protocol/src/RCUSettings.cc
+++ b/MAC/APL/PIC/RSP_Protocol/src/RCUSettings.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/src/RSUSettings.cc b/MAC/APL/PIC/RSP_Protocol/src/RSUSettings.cc
index e8073f662bc..b59b9dffb3c 100644
--- a/MAC/APL/PIC/RSP_Protocol/src/RSUSettings.cc
+++ b/MAC/APL/PIC/RSP_Protocol/src/RSUSettings.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/src/SDOMode.cc b/MAC/APL/PIC/RSP_Protocol/src/SDOMode.cc
index 8b26fff2611..2aec1b0cd43 100644
--- a/MAC/APL/PIC/RSP_Protocol/src/SDOMode.cc
+++ b/MAC/APL/PIC/RSP_Protocol/src/SDOMode.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/src/SDOSelection.cc b/MAC/APL/PIC/RSP_Protocol/src/SDOSelection.cc
index d4b01401ade..a627c1be0ef 100644
--- a/MAC/APL/PIC/RSP_Protocol/src/SDOSelection.cc
+++ b/MAC/APL/PIC/RSP_Protocol/src/SDOSelection.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/src/SPUStatus.cc b/MAC/APL/PIC/RSP_Protocol/src/SPUStatus.cc
index 4bc185ba6e4..5fbfe57a717 100644
--- a/MAC/APL/PIC/RSP_Protocol/src/SPUStatus.cc
+++ b/MAC/APL/PIC/RSP_Protocol/src/SPUStatus.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2008
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/src/Statistics.cc b/MAC/APL/PIC/RSP_Protocol/src/Statistics.cc
index 91b0b9d48b9..d5fe5acd7ed 100644
--- a/MAC/APL/PIC/RSP_Protocol/src/Statistics.cc
+++ b/MAC/APL/PIC/RSP_Protocol/src/Statistics.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/src/SubbandSelection.cc b/MAC/APL/PIC/RSP_Protocol/src/SubbandSelection.cc
index e5b11c6dfe8..e7775a7ef12 100644
--- a/MAC/APL/PIC/RSP_Protocol/src/SubbandSelection.cc
+++ b/MAC/APL/PIC/RSP_Protocol/src/SubbandSelection.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/src/SystemStatus.cc b/MAC/APL/PIC/RSP_Protocol/src/SystemStatus.cc
index a68bd1f8ed5..fb74ff657a1 100644
--- a/MAC/APL/PIC/RSP_Protocol/src/SystemStatus.cc
+++ b/MAC/APL/PIC/RSP_Protocol/src/SystemStatus.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/src/TBBSettings.cc b/MAC/APL/PIC/RSP_Protocol/src/TBBSettings.cc
index 0ce0dad1061..3bf2e5aea12 100644
--- a/MAC/APL/PIC/RSP_Protocol/src/TBBSettings.cc
+++ b/MAC/APL/PIC/RSP_Protocol/src/TBBSettings.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/src/TDStatus.cc b/MAC/APL/PIC/RSP_Protocol/src/TDStatus.cc
index 6fe844f89bc..ef2455782c5 100644
--- a/MAC/APL/PIC/RSP_Protocol/src/TDStatus.cc
+++ b/MAC/APL/PIC/RSP_Protocol/src/TDStatus.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/src/Versions.cc b/MAC/APL/PIC/RSP_Protocol/src/Versions.cc
index 0a022b0d76a..6c851f54d72 100644
--- a/MAC/APL/PIC/RSP_Protocol/src/Versions.cc
+++ b/MAC/APL/PIC/RSP_Protocol/src/Versions.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/src/WGSettings.cc b/MAC/APL/PIC/RSP_Protocol/src/WGSettings.cc
index 4336bc9a1d8..42182dca84c 100644
--- a/MAC/APL/PIC/RSP_Protocol/src/WGSettings.cc
+++ b/MAC/APL/PIC/RSP_Protocol/src/WGSettings.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/src/XCStatistics.cc b/MAC/APL/PIC/RSP_Protocol/src/XCStatistics.cc
index fa75352da97..6e720e95c51 100644
--- a/MAC/APL/PIC/RSP_Protocol/src/XCStatistics.cc
+++ b/MAC/APL/PIC/RSP_Protocol/src/XCStatistics.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/RSP_Protocol/test/tRCUSettings.cc b/MAC/APL/PIC/RSP_Protocol/test/tRCUSettings.cc
index 0a34be9429f..69edd9d1aab 100644
--- a/MAC/APL/PIC/RSP_Protocol/test/tRCUSettings.cc
+++ b/MAC/APL/PIC/RSP_Protocol/test/tRCUSettings.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/AllocCmd.cc b/MAC/APL/PIC/TBB_Driver/src/AllocCmd.cc
index 3c620cef624..0fcfdca5f15 100644
--- a/MAC/APL/PIC/TBB_Driver/src/AllocCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/AllocCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/AllocCmd.h b/MAC/APL/PIC/TBB_Driver/src/AllocCmd.h
index 7cced4abf53..c479112c14b 100644
--- a/MAC/APL/PIC/TBB_Driver/src/AllocCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/AllocCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/ArpCmd.cc b/MAC/APL/PIC/TBB_Driver/src/ArpCmd.cc
index 21c217434b6..1df265d4440 100644
--- a/MAC/APL/PIC/TBB_Driver/src/ArpCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/ArpCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/ArpCmd.h b/MAC/APL/PIC/TBB_Driver/src/ArpCmd.h
index 24ca37c96e2..f4dfae170b2 100644
--- a/MAC/APL/PIC/TBB_Driver/src/ArpCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/ArpCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/ArpModeCmd.cc b/MAC/APL/PIC/TBB_Driver/src/ArpModeCmd.cc
index 2059ca0bba3..93e8035df3c 100644
--- a/MAC/APL/PIC/TBB_Driver/src/ArpModeCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/ArpModeCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/ArpModeCmd.h b/MAC/APL/PIC/TBB_Driver/src/ArpModeCmd.h
index d7656694cb6..0fc1dafc5e3 100644
--- a/MAC/APL/PIC/TBB_Driver/src/ArpModeCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/ArpModeCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/BoardCmdHandler.cc b/MAC/APL/PIC/TBB_Driver/src/BoardCmdHandler.cc
index 7aafad5c46e..b46c2153d74 100644
--- a/MAC/APL/PIC/TBB_Driver/src/BoardCmdHandler.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/BoardCmdHandler.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/BoardCmdHandler.h b/MAC/APL/PIC/TBB_Driver/src/BoardCmdHandler.h
index ec24b93ee4f..7d704599158 100644
--- a/MAC/APL/PIC/TBB_Driver/src/BoardCmdHandler.h
+++ b/MAC/APL/PIC/TBB_Driver/src/BoardCmdHandler.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/CepDelayCmd.cc b/MAC/APL/PIC/TBB_Driver/src/CepDelayCmd.cc
index 604674ace3c..5575e205ff1 100644
--- a/MAC/APL/PIC/TBB_Driver/src/CepDelayCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/CepDelayCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/CepDelayCmd.h b/MAC/APL/PIC/TBB_Driver/src/CepDelayCmd.h
index 5a36c074395..c67f05c7f95 100644
--- a/MAC/APL/PIC/TBB_Driver/src/CepDelayCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/CepDelayCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/CepStatusCmd.cc b/MAC/APL/PIC/TBB_Driver/src/CepStatusCmd.cc
index 966bc702b79..0d8eeb0423a 100644
--- a/MAC/APL/PIC/TBB_Driver/src/CepStatusCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/CepStatusCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/CepStatusCmd.h b/MAC/APL/PIC/TBB_Driver/src/CepStatusCmd.h
index 11c771b486d..d958469663d 100644
--- a/MAC/APL/PIC/TBB_Driver/src/CepStatusCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/CepStatusCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/ClearCmd.cc b/MAC/APL/PIC/TBB_Driver/src/ClearCmd.cc
index 2292b838751..38a3595f2a2 100644
--- a/MAC/APL/PIC/TBB_Driver/src/ClearCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/ClearCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/ClearCmd.h b/MAC/APL/PIC/TBB_Driver/src/ClearCmd.h
index 240f7e8d628..cd39f90555c 100644
--- a/MAC/APL/PIC/TBB_Driver/src/ClearCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/ClearCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/Command.cc b/MAC/APL/PIC/TBB_Driver/src/Command.cc
index 19e9f0c7c01..92374a5c7e8 100644
--- a/MAC/APL/PIC/TBB_Driver/src/Command.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/Command.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/Command.h b/MAC/APL/PIC/TBB_Driver/src/Command.h
index 18c63aa1b81..c53ec4dba3c 100644
--- a/MAC/APL/PIC/TBB_Driver/src/Command.h
+++ b/MAC/APL/PIC/TBB_Driver/src/Command.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/ConfigCmd.cc b/MAC/APL/PIC/TBB_Driver/src/ConfigCmd.cc
index a95e9d2c850..c1d8428ff49 100644
--- a/MAC/APL/PIC/TBB_Driver/src/ConfigCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/ConfigCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/ConfigCmd.h b/MAC/APL/PIC/TBB_Driver/src/ConfigCmd.h
index 31c7e4c196e..fddb48b9709 100644
--- a/MAC/APL/PIC/TBB_Driver/src/ConfigCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/ConfigCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/DriverSettings.cc b/MAC/APL/PIC/TBB_Driver/src/DriverSettings.cc
index cd0401581ed..c220d823c2f 100644
--- a/MAC/APL/PIC/TBB_Driver/src/DriverSettings.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/DriverSettings.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/DriverSettings.h b/MAC/APL/PIC/TBB_Driver/src/DriverSettings.h
index b4e66048338..3d780115817 100644
--- a/MAC/APL/PIC/TBB_Driver/src/DriverSettings.h
+++ b/MAC/APL/PIC/TBB_Driver/src/DriverSettings.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/ErasefCmd.cc b/MAC/APL/PIC/TBB_Driver/src/ErasefCmd.cc
index 3e90d21b536..b3707e240e3 100644
--- a/MAC/APL/PIC/TBB_Driver/src/ErasefCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/ErasefCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/ErasefCmd.h b/MAC/APL/PIC/TBB_Driver/src/ErasefCmd.h
index f9b47887371..8ec0d186d22 100644
--- a/MAC/APL/PIC/TBB_Driver/src/ErasefCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/ErasefCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/FreeCmd.cc b/MAC/APL/PIC/TBB_Driver/src/FreeCmd.cc
index 148501640dc..67530e7995f 100644
--- a/MAC/APL/PIC/TBB_Driver/src/FreeCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/FreeCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/FreeCmd.h b/MAC/APL/PIC/TBB_Driver/src/FreeCmd.h
index ca757f4d587..7c4c536db0b 100644
--- a/MAC/APL/PIC/TBB_Driver/src/FreeCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/FreeCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/ImageInfoCmd.cc b/MAC/APL/PIC/TBB_Driver/src/ImageInfoCmd.cc
index 909c26f790f..624b9469a1d 100644
--- a/MAC/APL/PIC/TBB_Driver/src/ImageInfoCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/ImageInfoCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/ImageInfoCmd.h b/MAC/APL/PIC/TBB_Driver/src/ImageInfoCmd.h
index 2c1c6099dea..a5434c6f159 100644
--- a/MAC/APL/PIC/TBB_Driver/src/ImageInfoCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/ImageInfoCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/MsgHandler.cc b/MAC/APL/PIC/TBB_Driver/src/MsgHandler.cc
index 114e75e2356..4d53b5fb69d 100644
--- a/MAC/APL/PIC/TBB_Driver/src/MsgHandler.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/MsgHandler.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/MsgHandler.h b/MAC/APL/PIC/TBB_Driver/src/MsgHandler.h
index e7c0c9df6b3..a882dae53f8 100644
--- a/MAC/APL/PIC/TBB_Driver/src/MsgHandler.h
+++ b/MAC/APL/PIC/TBB_Driver/src/MsgHandler.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/PageperiodCmd.cc b/MAC/APL/PIC/TBB_Driver/src/PageperiodCmd.cc
index bfdcc9a2706..1ed869bfa6b 100644
--- a/MAC/APL/PIC/TBB_Driver/src/PageperiodCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/PageperiodCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/PageperiodCmd.h b/MAC/APL/PIC/TBB_Driver/src/PageperiodCmd.h
index 80e7a92dca7..3380eb4f1a1 100644
--- a/MAC/APL/PIC/TBB_Driver/src/PageperiodCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/PageperiodCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/RawEvent.cc b/MAC/APL/PIC/TBB_Driver/src/RawEvent.cc
index 676f9d4e8e6..2194eb533ff 100644
--- a/MAC/APL/PIC/TBB_Driver/src/RawEvent.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/RawEvent.cc
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/RawEvent.h b/MAC/APL/PIC/TBB_Driver/src/RawEvent.h
index c0beb42c1b9..62a0d9dad16 100644
--- a/MAC/APL/PIC/TBB_Driver/src/RawEvent.h
+++ b/MAC/APL/PIC/TBB_Driver/src/RawEvent.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/ReadCmd.cc b/MAC/APL/PIC/TBB_Driver/src/ReadCmd.cc
index 77662417d71..2e7da40e6e8 100644
--- a/MAC/APL/PIC/TBB_Driver/src/ReadCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/ReadCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/ReadCmd.h b/MAC/APL/PIC/TBB_Driver/src/ReadCmd.h
index 0e94c08af5e..3bf002466c3 100644
--- a/MAC/APL/PIC/TBB_Driver/src/ReadCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/ReadCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/ReadfCmd.cc b/MAC/APL/PIC/TBB_Driver/src/ReadfCmd.cc
index 7e8133fb3df..68f1d27f96d 100644
--- a/MAC/APL/PIC/TBB_Driver/src/ReadfCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/ReadfCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/ReadfCmd.h b/MAC/APL/PIC/TBB_Driver/src/ReadfCmd.h
index 28969cb8411..bc60ae24861 100644
--- a/MAC/APL/PIC/TBB_Driver/src/ReadfCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/ReadfCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/ReadrCmd.cc b/MAC/APL/PIC/TBB_Driver/src/ReadrCmd.cc
index c1b18db749b..6a3201447ba 100644
--- a/MAC/APL/PIC/TBB_Driver/src/ReadrCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/ReadrCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/ReadrCmd.h b/MAC/APL/PIC/TBB_Driver/src/ReadrCmd.h
index 1e785a857a5..7b199341e78 100644
--- a/MAC/APL/PIC/TBB_Driver/src/ReadrCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/ReadrCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/ReadwCmd.cc b/MAC/APL/PIC/TBB_Driver/src/ReadwCmd.cc
index ee442f277d0..ee88a95e61f 100644
--- a/MAC/APL/PIC/TBB_Driver/src/ReadwCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/ReadwCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/ReadwCmd.h b/MAC/APL/PIC/TBB_Driver/src/ReadwCmd.h
index ead3c5bed0f..7d0038fc7c2 100644
--- a/MAC/APL/PIC/TBB_Driver/src/ReadwCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/ReadwCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/ReadxCmd.cc b/MAC/APL/PIC/TBB_Driver/src/ReadxCmd.cc
index 0cf425f9009..178ed0abd7a 100644
--- a/MAC/APL/PIC/TBB_Driver/src/ReadxCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/ReadxCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/ReadxCmd.h b/MAC/APL/PIC/TBB_Driver/src/ReadxCmd.h
index c9aa10185e7..85f76c9cfee 100644
--- a/MAC/APL/PIC/TBB_Driver/src/ReadxCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/ReadxCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/RecordCmd.cc b/MAC/APL/PIC/TBB_Driver/src/RecordCmd.cc
index f77d0750b2f..b609a5e0f35 100644
--- a/MAC/APL/PIC/TBB_Driver/src/RecordCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/RecordCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/RecordCmd.h b/MAC/APL/PIC/TBB_Driver/src/RecordCmd.h
index 92881a552a1..e7d4f9c4b31 100644
--- a/MAC/APL/PIC/TBB_Driver/src/RecordCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/RecordCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/ResetCmd.cc b/MAC/APL/PIC/TBB_Driver/src/ResetCmd.cc
index d95d80470f6..9ca096deebf 100644
--- a/MAC/APL/PIC/TBB_Driver/src/ResetCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/ResetCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/ResetCmd.h b/MAC/APL/PIC/TBB_Driver/src/ResetCmd.h
index dd0f9829c10..3608669b650 100644
--- a/MAC/APL/PIC/TBB_Driver/src/ResetCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/ResetCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/SizeCmd.cc b/MAC/APL/PIC/TBB_Driver/src/SizeCmd.cc
index 0afaeae273e..28437b91fb4 100644
--- a/MAC/APL/PIC/TBB_Driver/src/SizeCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/SizeCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/SizeCmd.h b/MAC/APL/PIC/TBB_Driver/src/SizeCmd.h
index 31cf6163c3c..3aa17ef30b4 100644
--- a/MAC/APL/PIC/TBB_Driver/src/SizeCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/SizeCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/StatusCmd.cc b/MAC/APL/PIC/TBB_Driver/src/StatusCmd.cc
index 1f4f6fd0e51..e1c0242a5f0 100644
--- a/MAC/APL/PIC/TBB_Driver/src/StatusCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/StatusCmd.cc
@@ -1,7 +1,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/StatusCmd.h b/MAC/APL/PIC/TBB_Driver/src/StatusCmd.h
index c61bd19c491..2fa7e646e4d 100644
--- a/MAC/APL/PIC/TBB_Driver/src/StatusCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/StatusCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/StopCepCmd.cc b/MAC/APL/PIC/TBB_Driver/src/StopCepCmd.cc
index b8fa6ffe792..3e7feb1dbed 100644
--- a/MAC/APL/PIC/TBB_Driver/src/StopCepCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/StopCepCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/StopCepCmd.h b/MAC/APL/PIC/TBB_Driver/src/StopCepCmd.h
index e95e9cd5807..dcc8fd9d070 100644
--- a/MAC/APL/PIC/TBB_Driver/src/StopCepCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/StopCepCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/StopCmd.cc b/MAC/APL/PIC/TBB_Driver/src/StopCmd.cc
index c99bc2c09c5..f1fb2f97d0c 100644
--- a/MAC/APL/PIC/TBB_Driver/src/StopCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/StopCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/StopCmd.h b/MAC/APL/PIC/TBB_Driver/src/StopCmd.h
index 99eb38ed668..da67b5a4408 100644
--- a/MAC/APL/PIC/TBB_Driver/src/StopCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/StopCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/TBBDriver.cc b/MAC/APL/PIC/TBB_Driver/src/TBBDriver.cc
index 0e78f02cd1b..a16dfa903db 100644
--- a/MAC/APL/PIC/TBB_Driver/src/TBBDriver.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/TBBDriver.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/TBBDriver.h b/MAC/APL/PIC/TBB_Driver/src/TBBDriver.h
index ed4efe7ea21..53bce6458b6 100644
--- a/MAC/APL/PIC/TBB_Driver/src/TBBDriver.h
+++ b/MAC/APL/PIC/TBB_Driver/src/TBBDriver.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/TempLimitCmd.cc b/MAC/APL/PIC/TBB_Driver/src/TempLimitCmd.cc
index edc48edc373..871c63f284c 100644
--- a/MAC/APL/PIC/TBB_Driver/src/TempLimitCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/TempLimitCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/TempLimitCmd.h b/MAC/APL/PIC/TBB_Driver/src/TempLimitCmd.h
index 44eddb26ed8..79124f11968 100644
--- a/MAC/APL/PIC/TBB_Driver/src/TempLimitCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/TempLimitCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/TrigCoefCmd.cc b/MAC/APL/PIC/TBB_Driver/src/TrigCoefCmd.cc
index 22895e59978..84f97ea0abe 100644
--- a/MAC/APL/PIC/TBB_Driver/src/TrigCoefCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/TrigCoefCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/TrigCoefCmd.h b/MAC/APL/PIC/TBB_Driver/src/TrigCoefCmd.h
index 9a69f3d94c8..a648326180d 100644
--- a/MAC/APL/PIC/TBB_Driver/src/TrigCoefCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/TrigCoefCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/TrigCoefSameCmd.cc b/MAC/APL/PIC/TBB_Driver/src/TrigCoefSameCmd.cc
index 8484cd26a05..81d99e14a96 100644
--- a/MAC/APL/PIC/TBB_Driver/src/TrigCoefSameCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/TrigCoefSameCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/TrigCoefSameCmd.h b/MAC/APL/PIC/TBB_Driver/src/TrigCoefSameCmd.h
index ab858a5d3a2..cfdd5363279 100644
--- a/MAC/APL/PIC/TBB_Driver/src/TrigCoefSameCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/TrigCoefSameCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/TrigGenCmd.cc b/MAC/APL/PIC/TBB_Driver/src/TrigGenCmd.cc
index 4d0bf2d1b72..c37e922b768 100644
--- a/MAC/APL/PIC/TBB_Driver/src/TrigGenCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/TrigGenCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/TrigGenCmd.h b/MAC/APL/PIC/TBB_Driver/src/TrigGenCmd.h
index 2208dbc04d5..7e6f4dbf24a 100644
--- a/MAC/APL/PIC/TBB_Driver/src/TrigGenCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/TrigGenCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/TrigInfoCmd.cc b/MAC/APL/PIC/TBB_Driver/src/TrigInfoCmd.cc
index ea177aa97f0..188d9f56be7 100644
--- a/MAC/APL/PIC/TBB_Driver/src/TrigInfoCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/TrigInfoCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/TrigInfoCmd.h b/MAC/APL/PIC/TBB_Driver/src/TrigInfoCmd.h
index fb77d931ab4..2e5605bff7a 100644
--- a/MAC/APL/PIC/TBB_Driver/src/TrigInfoCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/TrigInfoCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/TrigReleaseCmd.cc b/MAC/APL/PIC/TBB_Driver/src/TrigReleaseCmd.cc
index 001d800ea05..b1080739dc6 100644
--- a/MAC/APL/PIC/TBB_Driver/src/TrigReleaseCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/TrigReleaseCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/TrigReleaseCmd.h b/MAC/APL/PIC/TBB_Driver/src/TrigReleaseCmd.h
index 077a6169341..5edef0bb5c3 100644
--- a/MAC/APL/PIC/TBB_Driver/src/TrigReleaseCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/TrigReleaseCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/TrigSetupCmd.cc b/MAC/APL/PIC/TBB_Driver/src/TrigSetupCmd.cc
index 5ff4c62fdec..17c0fbc9ac7 100644
--- a/MAC/APL/PIC/TBB_Driver/src/TrigSetupCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/TrigSetupCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/TrigSetupCmd.h b/MAC/APL/PIC/TBB_Driver/src/TrigSetupCmd.h
index 52ced881656..091a40cb0e1 100644
--- a/MAC/APL/PIC/TBB_Driver/src/TrigSetupCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/TrigSetupCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/TrigSetupSameCmd.cc b/MAC/APL/PIC/TBB_Driver/src/TrigSetupSameCmd.cc
index 5064b62f528..a8604d78e02 100644
--- a/MAC/APL/PIC/TBB_Driver/src/TrigSetupSameCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/TrigSetupSameCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/TrigSetupSameCmd.h b/MAC/APL/PIC/TBB_Driver/src/TrigSetupSameCmd.h
index 351172e90e5..49a65aa0fd9 100644
--- a/MAC/APL/PIC/TBB_Driver/src/TrigSetupSameCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/TrigSetupSameCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/UdpIpTools.h b/MAC/APL/PIC/TBB_Driver/src/UdpIpTools.h
index fa0b814fbb0..00ed3ffa901 100644
--- a/MAC/APL/PIC/TBB_Driver/src/UdpIpTools.h
+++ b/MAC/APL/PIC/TBB_Driver/src/UdpIpTools.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/VersionCmd.cc b/MAC/APL/PIC/TBB_Driver/src/VersionCmd.cc
index bee0daf3949..cd32de866ba 100644
--- a/MAC/APL/PIC/TBB_Driver/src/VersionCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/VersionCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/VersionCmd.h b/MAC/APL/PIC/TBB_Driver/src/VersionCmd.h
index bd1d2ce9487..8e0427b386d 100644
--- a/MAC/APL/PIC/TBB_Driver/src/VersionCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/VersionCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/WatchDogCmd.cc b/MAC/APL/PIC/TBB_Driver/src/WatchDogCmd.cc
index 5474a9d2707..87aa427bba8 100644
--- a/MAC/APL/PIC/TBB_Driver/src/WatchDogCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/WatchDogCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/WatchDogCmd.h b/MAC/APL/PIC/TBB_Driver/src/WatchDogCmd.h
index babf61f7fff..71f96a98755 100644
--- a/MAC/APL/PIC/TBB_Driver/src/WatchDogCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/WatchDogCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/WritefCmd.cc b/MAC/APL/PIC/TBB_Driver/src/WritefCmd.cc
index 797031f7733..ed50876e9f8 100644
--- a/MAC/APL/PIC/TBB_Driver/src/WritefCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/WritefCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/WritefCmd.h b/MAC/APL/PIC/TBB_Driver/src/WritefCmd.h
index 8d5afc102fc..f9d84aead3d 100644
--- a/MAC/APL/PIC/TBB_Driver/src/WritefCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/WritefCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/WriterCmd.cc b/MAC/APL/PIC/TBB_Driver/src/WriterCmd.cc
index 882658c3c42..baaaeef51b8 100644
--- a/MAC/APL/PIC/TBB_Driver/src/WriterCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/WriterCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/WriterCmd.h b/MAC/APL/PIC/TBB_Driver/src/WriterCmd.h
index 9a43d0135c7..58bad6001c8 100644
--- a/MAC/APL/PIC/TBB_Driver/src/WriterCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/WriterCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/WritewCmd.cc b/MAC/APL/PIC/TBB_Driver/src/WritewCmd.cc
index 85d8b4c7fa2..88c9c7bf8c4 100644
--- a/MAC/APL/PIC/TBB_Driver/src/WritewCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/WritewCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/WritewCmd.h b/MAC/APL/PIC/TBB_Driver/src/WritewCmd.h
index 3b09261ec2e..f7addd7789b 100644
--- a/MAC/APL/PIC/TBB_Driver/src/WritewCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/WritewCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/XXXCmd.cc b/MAC/APL/PIC/TBB_Driver/src/XXXCmd.cc
index dca0a278698..49566f8461a 100644
--- a/MAC/APL/PIC/TBB_Driver/src/XXXCmd.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/XXXCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/XXXCmd.h b/MAC/APL/PIC/TBB_Driver/src/XXXCmd.h
index cc65adf3173..50706c9498e 100644
--- a/MAC/APL/PIC/TBB_Driver/src/XXXCmd.h
+++ b/MAC/APL/PIC/TBB_Driver/src/XXXCmd.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/tbbctl.cc b/MAC/APL/PIC/TBB_Driver/src/tbbctl.cc
index 51ca1d75874..ce950de11ca 100644
--- a/MAC/APL/PIC/TBB_Driver/src/tbbctl.cc
+++ b/MAC/APL/PIC/TBB_Driver/src/tbbctl.cc
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/src/tbbctl.h b/MAC/APL/PIC/TBB_Driver/src/tbbctl.h
index c4e358d9ee4..3726e2e5709 100644
--- a/MAC/APL/PIC/TBB_Driver/src/tbbctl.h
+++ b/MAC/APL/PIC/TBB_Driver/src/tbbctl.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/test/StubRawEvent.cc b/MAC/APL/PIC/TBB_Driver/test/StubRawEvent.cc
index dcb0057b661..90a7a42b7aa 100644
--- a/MAC/APL/PIC/TBB_Driver/test/StubRawEvent.cc
+++ b/MAC/APL/PIC/TBB_Driver/test/StubRawEvent.cc
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/test/StubRawEvent.h b/MAC/APL/PIC/TBB_Driver/test/StubRawEvent.h
index d668d9de95b..cbd0a88914d 100644
--- a/MAC/APL/PIC/TBB_Driver/test/StubRawEvent.h
+++ b/MAC/APL/PIC/TBB_Driver/test/StubRawEvent.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/test/TBBTest.cc b/MAC/APL/PIC/TBB_Driver/test/TBBTest.cc
index 8be7303bc9e..5a30dc989f0 100644
--- a/MAC/APL/PIC/TBB_Driver/test/TBBTest.cc
+++ b/MAC/APL/PIC/TBB_Driver/test/TBBTest.cc
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/test/TBBTest.h b/MAC/APL/PIC/TBB_Driver/test/TBBTest.h
index d0368256d25..204d11eb3cb 100644
--- a/MAC/APL/PIC/TBB_Driver/test/TBBTest.h
+++ b/MAC/APL/PIC/TBB_Driver/test/TBBTest.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/test/TBBTestSuite.h b/MAC/APL/PIC/TBB_Driver/test/TBBTestSuite.h
index 60d74078f46..064c1160388 100644
--- a/MAC/APL/PIC/TBB_Driver/test/TBBTestSuite.h
+++ b/MAC/APL/PIC/TBB_Driver/test/TBBTestSuite.h
@@ -5,7 +5,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/test/TPStub.cc b/MAC/APL/PIC/TBB_Driver/test/TPStub.cc
index 8128e45a8ef..f9a32567fa6 100644
--- a/MAC/APL/PIC/TBB_Driver/test/TPStub.cc
+++ b/MAC/APL/PIC/TBB_Driver/test/TPStub.cc
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/PIC/TBB_Driver/test/TPStub.h b/MAC/APL/PIC/TBB_Driver/test/TPStub.h
index f0bf5e3b1bd..a58b3d3ec1c 100644
--- a/MAC/APL/PIC/TBB_Driver/test/TPStub.h
+++ b/MAC/APL/PIC/TBB_Driver/test/TPStub.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/RTCCommon/include/APL/RTCCommon/MarshallBlitz.h b/MAC/APL/RTCCommon/include/APL/RTCCommon/MarshallBlitz.h
index 257d885b605..93406e176fe 100644
--- a/MAC/APL/RTCCommon/include/APL/RTCCommon/MarshallBlitz.h
+++ b/MAC/APL/RTCCommon/include/APL/RTCCommon/MarshallBlitz.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/RTCCommon/include/APL/RTCCommon/Observer.h b/MAC/APL/RTCCommon/include/APL/RTCCommon/Observer.h
index 35052f23772..8a6eee1fff0 100644
--- a/MAC/APL/RTCCommon/include/APL/RTCCommon/Observer.h
+++ b/MAC/APL/RTCCommon/include/APL/RTCCommon/Observer.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/RTCCommon/include/APL/RTCCommon/PSAccess.h b/MAC/APL/RTCCommon/include/APL/RTCCommon/PSAccess.h
index b72d3f19be5..bc68ed9e222 100644
--- a/MAC/APL/RTCCommon/include/APL/RTCCommon/PSAccess.h
+++ b/MAC/APL/RTCCommon/include/APL/RTCCommon/PSAccess.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/RTCCommon/include/APL/RTCCommon/RegisterState.h b/MAC/APL/RTCCommon/include/APL/RTCCommon/RegisterState.h
index 90078e734a9..d247674115d 100644
--- a/MAC/APL/RTCCommon/include/APL/RTCCommon/RegisterState.h
+++ b/MAC/APL/RTCCommon/include/APL/RTCCommon/RegisterState.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/RTCCommon/include/APL/RTCCommon/Subject.h b/MAC/APL/RTCCommon/include/APL/RTCCommon/Subject.h
index fe702f66bcc..9c163717869 100644
--- a/MAC/APL/RTCCommon/include/APL/RTCCommon/Subject.h
+++ b/MAC/APL/RTCCommon/include/APL/RTCCommon/Subject.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/RTCCommon/include/APL/RTCCommon/TestSuite.h b/MAC/APL/RTCCommon/include/APL/RTCCommon/TestSuite.h
index 4639b538d87..bf3bac978bd 100644
--- a/MAC/APL/RTCCommon/include/APL/RTCCommon/TestSuite.h
+++ b/MAC/APL/RTCCommon/include/APL/RTCCommon/TestSuite.h
@@ -5,7 +5,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/RTCCommon/include/APL/RTCCommon/Timestamp.h b/MAC/APL/RTCCommon/include/APL/RTCCommon/Timestamp.h
index c4be06cd248..ec617e48fb2 100644
--- a/MAC/APL/RTCCommon/include/APL/RTCCommon/Timestamp.h
+++ b/MAC/APL/RTCCommon/include/APL/RTCCommon/Timestamp.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/RTCCommon/include/APL/RTCCommon/daemonize.h b/MAC/APL/RTCCommon/include/APL/RTCCommon/daemonize.h
index 6b78640a559..70fb758d293 100644
--- a/MAC/APL/RTCCommon/include/APL/RTCCommon/daemonize.h
+++ b/MAC/APL/RTCCommon/include/APL/RTCCommon/daemonize.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/RTCCommon/src/RegisterState.cc b/MAC/APL/RTCCommon/src/RegisterState.cc
index f0b0394ca96..cfe487c4be1 100644
--- a/MAC/APL/RTCCommon/src/RegisterState.cc
+++ b/MAC/APL/RTCCommon/src/RegisterState.cc
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/RTCCommon/src/Subject.cc b/MAC/APL/RTCCommon/src/Subject.cc
index e3fceb4fa60..f47ba1961c1 100644
--- a/MAC/APL/RTCCommon/src/Subject.cc
+++ b/MAC/APL/RTCCommon/src/Subject.cc
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/RTCCommon/src/Timestamp.cc b/MAC/APL/RTCCommon/src/Timestamp.cc
index aaad5286fda..bc3644c2fca 100644
--- a/MAC/APL/RTCCommon/src/Timestamp.cc
+++ b/MAC/APL/RTCCommon/src/Timestamp.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/RTCCommon/test/tBlitz.cc b/MAC/APL/RTCCommon/test/tBlitz.cc
index 943a329996b..1a5f71537ea 100644
--- a/MAC/APL/RTCCommon/test/tBlitz.cc
+++ b/MAC/APL/RTCCommon/test/tBlitz.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/RTCCommon/test/tMarshallBlitz.cc b/MAC/APL/RTCCommon/test/tMarshallBlitz.cc
index 9ed18a6ccce..369a3f9a6c3 100644
--- a/MAC/APL/RTCCommon/test/tMarshallBlitz.cc
+++ b/MAC/APL/RTCCommon/test/tMarshallBlitz.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/RTCCommon/test/tTimestamp.cc b/MAC/APL/RTCCommon/test/tTimestamp.cc
index 90578b30ac0..1b98b64af0a 100644
--- a/MAC/APL/RTCCommon/test/tTimestamp.cc
+++ b/MAC/APL/RTCCommon/test/tTimestamp.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2011
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/RTDBCommon/include/APL/RTDBCommon/ClaimMgrTask.h b/MAC/APL/RTDBCommon/include/APL/RTDBCommon/ClaimMgrTask.h
index ad8bf96deeb..d01660a4a6a 100644
--- a/MAC/APL/RTDBCommon/include/APL/RTDBCommon/ClaimMgrTask.h
+++ b/MAC/APL/RTDBCommon/include/APL/RTDBCommon/ClaimMgrTask.h
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/RTDBCommon/include/APL/RTDBCommon/RTDButilities.h b/MAC/APL/RTDBCommon/include/APL/RTDBCommon/RTDButilities.h
index c88e1eb15f1..9c93ff2cca3 100644
--- a/MAC/APL/RTDBCommon/include/APL/RTDBCommon/RTDButilities.h
+++ b/MAC/APL/RTDBCommon/include/APL/RTDBCommon/RTDButilities.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/RTDBCommon/src/CM_Protocol.prot b/MAC/APL/RTDBCommon/src/CM_Protocol.prot
index 8726a18b6bc..caa5f115a65 100644
--- a/MAC/APL/RTDBCommon/src/CM_Protocol.prot
+++ b/MAC/APL/RTDBCommon/src/CM_Protocol.prot
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2008
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/RTDBCommon/src/ClaimMgrTask.cc b/MAC/APL/RTDBCommon/src/ClaimMgrTask.cc
index 93dc5009e2f..30e48df00e5 100644
--- a/MAC/APL/RTDBCommon/src/ClaimMgrTask.cc
+++ b/MAC/APL/RTDBCommon/src/ClaimMgrTask.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2008
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/RTDBCommon/src/RTDButilities.cc b/MAC/APL/RTDBCommon/src/RTDButilities.cc
index 9f9e3967327..bb1f9e5e471 100644
--- a/MAC/APL/RTDBCommon/src/RTDButilities.cc
+++ b/MAC/APL/RTDBCommon/src/RTDButilities.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/RTDBCommon/src/disabledRCUlist.cc b/MAC/APL/RTDBCommon/src/disabledRCUlist.cc
index 400cc41bb91..e99a476b818 100644
--- a/MAC/APL/RTDBCommon/src/disabledRCUlist.cc
+++ b/MAC/APL/RTDBCommon/src/disabledRCUlist.cc
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2011
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/RTDBCommon/src/disabledRCUlist.h b/MAC/APL/RTDBCommon/src/disabledRCUlist.h
index c45b7fb5e8e..ace28f356c2 100644
--- a/MAC/APL/RTDBCommon/src/disabledRCUlist.h
+++ b/MAC/APL/RTDBCommon/src/disabledRCUlist.h
@@ -2,7 +2,7 @@
 //
 //  Copyright (C) 2011
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/RTDBCommon/src/setObjectState.cc b/MAC/APL/RTDBCommon/src/setObjectState.cc
index ecece1201ea..99888894536 100644
--- a/MAC/APL/RTDBCommon/src/setObjectState.cc
+++ b/MAC/APL/RTDBCommon/src/setObjectState.cc
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2011
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/RTDBCommon/src/setObjectState.h b/MAC/APL/RTDBCommon/src/setObjectState.h
index a94bb309820..a81f5e44b83 100644
--- a/MAC/APL/RTDBCommon/src/setObjectState.h
+++ b/MAC/APL/RTDBCommon/src/setObjectState.h
@@ -2,7 +2,7 @@
 //
 //  Copyright (C) 2011
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/RTDBCommon/test/tClaimManager.cc b/MAC/APL/RTDBCommon/test/tClaimManager.cc
index 7e198278f3d..dbf1b21a67f 100644
--- a/MAC/APL/RTDBCommon/test/tClaimManager.cc
+++ b/MAC/APL/RTDBCommon/test/tClaimManager.cc
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2008
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/RTDBCommon/test/tClaimManager.h b/MAC/APL/RTDBCommon/test/tClaimManager.h
index 9c46541d201..bd781f2541c 100644
--- a/MAC/APL/RTDBCommon/test/tClaimManager.h
+++ b/MAC/APL/RTDBCommon/test/tClaimManager.h
@@ -2,7 +2,7 @@
 //
 //  Copyright (C) 2008
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/RTDBCommon/test/tRTDButilities.cc b/MAC/APL/RTDBCommon/test/tRTDButilities.cc
index c99ef65742b..cdb51fa3dca 100644
--- a/MAC/APL/RTDBCommon/test/tRTDButilities.cc
+++ b/MAC/APL/RTDBCommon/test/tRTDButilities.cc
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2007
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/RTDBCommon/test/tRTDButilities.h b/MAC/APL/RTDBCommon/test/tRTDButilities.h
index e25d16b34db..da4eb998699 100644
--- a/MAC/APL/RTDBCommon/test/tRTDButilities.h
+++ b/MAC/APL/RTDBCommon/test/tRTDButilities.h
@@ -2,7 +2,7 @@
 //
 //  Copyright (C) 2007
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/BeamControl/BeamControl.cc b/MAC/APL/StationCU/src/BeamControl/BeamControl.cc
index b6b58bff3cd..b5bbbcb16f9 100644
--- a/MAC/APL/StationCU/src/BeamControl/BeamControl.cc
+++ b/MAC/APL/StationCU/src/BeamControl/BeamControl.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/BeamControl/BeamControl.h b/MAC/APL/StationCU/src/BeamControl/BeamControl.h
index 2e8ab10378b..ff26ee77efa 100644
--- a/MAC/APL/StationCU/src/BeamControl/BeamControl.h
+++ b/MAC/APL/StationCU/src/BeamControl/BeamControl.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/BeamControl/BeamControlMain.cc b/MAC/APL/StationCU/src/BeamControl/BeamControlMain.cc
index b6eab6f10ce..3635cbe1140 100644
--- a/MAC/APL/StationCU/src/BeamControl/BeamControlMain.cc
+++ b/MAC/APL/StationCU/src/BeamControl/BeamControlMain.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/CalibrationControl/CalibrationControl.cc b/MAC/APL/StationCU/src/CalibrationControl/CalibrationControl.cc
index fe1d2cb3e30..255d5363efb 100644
--- a/MAC/APL/StationCU/src/CalibrationControl/CalibrationControl.cc
+++ b/MAC/APL/StationCU/src/CalibrationControl/CalibrationControl.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/CalibrationControl/CalibrationControl.h b/MAC/APL/StationCU/src/CalibrationControl/CalibrationControl.h
index 846e6f603d4..d8ac8d59ea9 100644
--- a/MAC/APL/StationCU/src/CalibrationControl/CalibrationControl.h
+++ b/MAC/APL/StationCU/src/CalibrationControl/CalibrationControl.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/CalibrationControl/CalibrationControlMain.cc b/MAC/APL/StationCU/src/CalibrationControl/CalibrationControlMain.cc
index d6f05db5fba..a58b1e3cf51 100644
--- a/MAC/APL/StationCU/src/CalibrationControl/CalibrationControlMain.cc
+++ b/MAC/APL/StationCU/src/CalibrationControl/CalibrationControlMain.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/ClockControl/ClockControl.cc b/MAC/APL/StationCU/src/ClockControl/ClockControl.cc
index c551aec3044..e14df9add84 100644
--- a/MAC/APL/StationCU/src/ClockControl/ClockControl.cc
+++ b/MAC/APL/StationCU/src/ClockControl/ClockControl.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006-2009
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/ClockControl/ClockControl.h b/MAC/APL/StationCU/src/ClockControl/ClockControl.h
index 7ea9e075bf0..44966080d94 100644
--- a/MAC/APL/StationCU/src/ClockControl/ClockControl.h
+++ b/MAC/APL/StationCU/src/ClockControl/ClockControl.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/ClockControl/ClockControlMain.cc b/MAC/APL/StationCU/src/ClockControl/ClockControlMain.cc
index 23e3a6158a5..8b35a9e47b4 100644
--- a/MAC/APL/StationCU/src/ClockControl/ClockControlMain.cc
+++ b/MAC/APL/StationCU/src/ClockControl/ClockControlMain.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/ClockControl/clkctl.cc b/MAC/APL/StationCU/src/ClockControl/clkctl.cc
index a325cf7c1f7..81fde40a8c4 100644
--- a/MAC/APL/StationCU/src/ClockControl/clkctl.cc
+++ b/MAC/APL/StationCU/src/ClockControl/clkctl.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2009
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/ClockControl/clkctl.h b/MAC/APL/StationCU/src/ClockControl/clkctl.h
index ba47cb92cd4..0e8d5669d17 100644
--- a/MAC/APL/StationCU/src/ClockControl/clkctl.h
+++ b/MAC/APL/StationCU/src/ClockControl/clkctl.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2009
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/ClockProtocol/Clock_Protocol.prot b/MAC/APL/StationCU/src/ClockProtocol/Clock_Protocol.prot
index 711f6ae7f17..56c653f799d 100644
--- a/MAC/APL/StationCU/src/ClockProtocol/Clock_Protocol.prot
+++ b/MAC/APL/StationCU/src/ClockProtocol/Clock_Protocol.prot
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2009
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/HardwareMonitor/ECMonitor.cc b/MAC/APL/StationCU/src/HardwareMonitor/ECMonitor.cc
index 74ccce3700a..b1517b62bff 100644
--- a/MAC/APL/StationCU/src/HardwareMonitor/ECMonitor.cc
+++ b/MAC/APL/StationCU/src/HardwareMonitor/ECMonitor.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/HardwareMonitor/ECMonitor.h b/MAC/APL/StationCU/src/HardwareMonitor/ECMonitor.h
index 50e3bc7def3..96867cc6b5c 100644
--- a/MAC/APL/StationCU/src/HardwareMonitor/ECMonitor.h
+++ b/MAC/APL/StationCU/src/HardwareMonitor/ECMonitor.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/HardwareMonitor/HardwareMonitorMain.cc b/MAC/APL/StationCU/src/HardwareMonitor/HardwareMonitorMain.cc
index f671ca5b3a4..d21c9bf1728 100644
--- a/MAC/APL/StationCU/src/HardwareMonitor/HardwareMonitorMain.cc
+++ b/MAC/APL/StationCU/src/HardwareMonitor/HardwareMonitorMain.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/HardwareMonitor/RCUConstants.h b/MAC/APL/StationCU/src/HardwareMonitor/RCUConstants.h
index 3d06b69a8d3..fc4c0f68699 100644
--- a/MAC/APL/StationCU/src/HardwareMonitor/RCUConstants.h
+++ b/MAC/APL/StationCU/src/HardwareMonitor/RCUConstants.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/HardwareMonitor/RSPMonitor.cc b/MAC/APL/StationCU/src/HardwareMonitor/RSPMonitor.cc
index ce5991b429b..b75f4d372b6 100644
--- a/MAC/APL/StationCU/src/HardwareMonitor/RSPMonitor.cc
+++ b/MAC/APL/StationCU/src/HardwareMonitor/RSPMonitor.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/HardwareMonitor/RSPMonitor.h b/MAC/APL/StationCU/src/HardwareMonitor/RSPMonitor.h
index 8b0c3905a89..b1c9fc5e277 100644
--- a/MAC/APL/StationCU/src/HardwareMonitor/RSPMonitor.h
+++ b/MAC/APL/StationCU/src/HardwareMonitor/RSPMonitor.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/HardwareMonitor/TBBMonitor.cc b/MAC/APL/StationCU/src/HardwareMonitor/TBBMonitor.cc
index c2e1ac812b1..8a953191bd5 100644
--- a/MAC/APL/StationCU/src/HardwareMonitor/TBBMonitor.cc
+++ b/MAC/APL/StationCU/src/HardwareMonitor/TBBMonitor.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/HardwareMonitor/TBBMonitor.h b/MAC/APL/StationCU/src/HardwareMonitor/TBBMonitor.h
index 1b9a43b54ef..73535f2f0e4 100644
--- a/MAC/APL/StationCU/src/HardwareMonitor/TBBMonitor.h
+++ b/MAC/APL/StationCU/src/HardwareMonitor/TBBMonitor.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/StationControl/ActiveObs.cc b/MAC/APL/StationCU/src/StationControl/ActiveObs.cc
index 8323c99fbcc..9a80f1d7db5 100644
--- a/MAC/APL/StationCU/src/StationControl/ActiveObs.cc
+++ b/MAC/APL/StationCU/src/StationControl/ActiveObs.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/StationControl/ActiveObs.h b/MAC/APL/StationCU/src/StationControl/ActiveObs.h
index 3363d6c49e9..bdb1a139dec 100644
--- a/MAC/APL/StationCU/src/StationControl/ActiveObs.h
+++ b/MAC/APL/StationCU/src/StationControl/ActiveObs.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/StationControl/StationControl.cc b/MAC/APL/StationCU/src/StationControl/StationControl.cc
index a02a5451ac5..88b9691ef87 100644
--- a/MAC/APL/StationCU/src/StationControl/StationControl.cc
+++ b/MAC/APL/StationCU/src/StationControl/StationControl.cc
@@ -2,7 +2,7 @@
 //
 //	Copyright (C) 2006-2008
 //	ASTRON (Netherlands Foundation for Research in Astronomy)
-//	P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//	P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //	This program is free software; you can redistribute it and/or modify
 //	it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/StationControl/StationControl.h b/MAC/APL/StationCU/src/StationControl/StationControl.h
index 9eae03ecf6d..95fd8270413 100644
--- a/MAC/APL/StationCU/src/StationControl/StationControl.h
+++ b/MAC/APL/StationCU/src/StationControl/StationControl.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/StationControl/StationControlMain.cc b/MAC/APL/StationCU/src/StationControl/StationControlMain.cc
index 38ff113ea9e..81299a4cb84 100644
--- a/MAC/APL/StationCU/src/StationControl/StationControlMain.cc
+++ b/MAC/APL/StationCU/src/StationControl/StationControlMain.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/TBBControl/TBBControl.cc b/MAC/APL/StationCU/src/TBBControl/TBBControl.cc
index 4fe511fc448..b05d1d5d73d 100644
--- a/MAC/APL/StationCU/src/TBBControl/TBBControl.cc
+++ b/MAC/APL/StationCU/src/TBBControl/TBBControl.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/TBBControl/TBBControl.h b/MAC/APL/StationCU/src/TBBControl/TBBControl.h
index a20e11f52e4..8b4d6883883 100644
--- a/MAC/APL/StationCU/src/TBBControl/TBBControl.h
+++ b/MAC/APL/StationCU/src/TBBControl/TBBControl.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/TBBControl/TBBControlMain.cc b/MAC/APL/StationCU/src/TBBControl/TBBControlMain.cc
index ad92c3b9f5a..30d4a91babf 100644
--- a/MAC/APL/StationCU/src/TBBControl/TBBControlMain.cc
+++ b/MAC/APL/StationCU/src/TBBControl/TBBControlMain.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/TBBControl/TBBObservation.cc b/MAC/APL/StationCU/src/TBBControl/TBBObservation.cc
index 04fa3d56e04..ffdcf92ed05 100644
--- a/MAC/APL/StationCU/src/TBBControl/TBBObservation.cc
+++ b/MAC/APL/StationCU/src/TBBControl/TBBObservation.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/TBBControl/TBBObservation.h b/MAC/APL/StationCU/src/TBBControl/TBBObservation.h
index 9c2e7d0d5e7..03f0495ca7f 100644
--- a/MAC/APL/StationCU/src/TBBControl/TBBObservation.h
+++ b/MAC/APL/StationCU/src/TBBControl/TBBObservation.h
@@ -2,7 +2,7 @@
 //# 
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/TBBControl/trigctl.cc b/MAC/APL/StationCU/src/TBBControl/trigctl.cc
index aea835c9476..9264d493686 100644
--- a/MAC/APL/StationCU/src/TBBControl/trigctl.cc
+++ b/MAC/APL/StationCU/src/TBBControl/trigctl.cc
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/StationCU/src/TBBControl/trigctl.h b/MAC/APL/StationCU/src/TBBControl/trigctl.h
index 57f463852a9..34794ec0b5f 100644
--- a/MAC/APL/StationCU/src/TBBControl/trigctl.h
+++ b/MAC/APL/StationCU/src/TBBControl/trigctl.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/TestCtlr/src/CodeLoggingTest.cc b/MAC/APL/TestCtlr/src/CodeLoggingTest.cc
index 659f3fa6331..25fad0b88f8 100644
--- a/MAC/APL/TestCtlr/src/CodeLoggingTest.cc
+++ b/MAC/APL/TestCtlr/src/CodeLoggingTest.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/TestCtlr/src/ControllerMenu.cc b/MAC/APL/TestCtlr/src/ControllerMenu.cc
index 0f5b2b7d06e..4db2c27ec46 100644
--- a/MAC/APL/TestCtlr/src/ControllerMenu.cc
+++ b/MAC/APL/TestCtlr/src/ControllerMenu.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/TestCtlr/src/ControllerMenu.h b/MAC/APL/TestCtlr/src/ControllerMenu.h
index 4c79578cc26..f87761e9f9c 100644
--- a/MAC/APL/TestCtlr/src/ControllerMenu.h
+++ b/MAC/APL/TestCtlr/src/ControllerMenu.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/TestCtlr/src/ControllerMenuMain.cc b/MAC/APL/TestCtlr/src/ControllerMenuMain.cc
index 6f0598b4828..aff7dad39ed 100644
--- a/MAC/APL/TestCtlr/src/ControllerMenuMain.cc
+++ b/MAC/APL/TestCtlr/src/ControllerMenuMain.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/TestCtlr/src/TestController.cc b/MAC/APL/TestCtlr/src/TestController.cc
index 0393711b51d..2cd6ec3cdcc 100644
--- a/MAC/APL/TestCtlr/src/TestController.cc
+++ b/MAC/APL/TestCtlr/src/TestController.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/TestCtlr/src/TestController.h b/MAC/APL/TestCtlr/src/TestController.h
index 1322c9ef887..6d28e1ef6f7 100644
--- a/MAC/APL/TestCtlr/src/TestController.h
+++ b/MAC/APL/TestCtlr/src/TestController.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/TestCtlr/src/TestControllerMain.cc b/MAC/APL/TestCtlr/src/TestControllerMain.cc
index 9d1dfb04def..8dc28f49bc4 100644
--- a/MAC/APL/TestCtlr/src/TestControllerMain.cc
+++ b/MAC/APL/TestCtlr/src/TestControllerMain.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/TestSuite/include/TestSuite/suite.h b/MAC/APL/TestSuite/include/TestSuite/suite.h
index 18cd22c2243..5109c6275dd 100644
--- a/MAC/APL/TestSuite/include/TestSuite/suite.h
+++ b/MAC/APL/TestSuite/include/TestSuite/suite.h
@@ -11,7 +11,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/TestSuite/include/TestSuite/test.h b/MAC/APL/TestSuite/include/TestSuite/test.h
index b81e283e815..2197cfc81f7 100644
--- a/MAC/APL/TestSuite/include/TestSuite/test.h
+++ b/MAC/APL/TestSuite/include/TestSuite/test.h
@@ -11,7 +11,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/TestSuite/src/suite.cpp b/MAC/APL/TestSuite/src/suite.cpp
index aa2688bd72e..75a6ca17fbb 100644
--- a/MAC/APL/TestSuite/src/suite.cpp
+++ b/MAC/APL/TestSuite/src/suite.cpp
@@ -11,7 +11,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/TestSuite/src/test.cpp b/MAC/APL/TestSuite/src/test.cpp
index 52d3781665c..cb37bb3be9e 100644
--- a/MAC/APL/TestSuite/src/test.cpp
+++ b/MAC/APL/TestSuite/src/test.cpp
@@ -11,7 +11,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/VHECR/include/VHECR/TBBReadCmd.h b/MAC/APL/VHECR/include/VHECR/TBBReadCmd.h
index b862ef69da6..04a87813315 100644
--- a/MAC/APL/VHECR/include/VHECR/TBBReadCmd.h
+++ b/MAC/APL/VHECR/include/VHECR/TBBReadCmd.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/VHECR/include/VHECR/TBBTrigger.h b/MAC/APL/VHECR/include/VHECR/TBBTrigger.h
index c8c2d09daa1..abfb56684ad 100644
--- a/MAC/APL/VHECR/include/VHECR/TBBTrigger.h
+++ b/MAC/APL/VHECR/include/VHECR/TBBTrigger.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/VHECR/include/VHECR/VHECRTask.h b/MAC/APL/VHECR/include/VHECR/VHECRTask.h
index 61c2ca522a3..9dec920711c 100644
--- a/MAC/APL/VHECR/include/VHECR/VHECRTask.h
+++ b/MAC/APL/VHECR/include/VHECR/VHECRTask.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/VHECR/include/VHECR/VHECRsettings.h b/MAC/APL/VHECR/include/VHECR/VHECRsettings.h
index aa2166a7592..6085451a9f7 100644
--- a/MAC/APL/VHECR/include/VHECR/VHECRsettings.h
+++ b/MAC/APL/VHECR/include/VHECR/VHECRsettings.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/VHECR/src/TBBReadCmd.cc b/MAC/APL/VHECR/src/TBBReadCmd.cc
index 182992613b8..a6f4f7fe458 100644
--- a/MAC/APL/VHECR/src/TBBReadCmd.cc
+++ b/MAC/APL/VHECR/src/TBBReadCmd.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/VHECR/src/TBBTrigger.cc b/MAC/APL/VHECR/src/TBBTrigger.cc
index e854185888f..130a0fbab82 100644
--- a/MAC/APL/VHECR/src/TBBTrigger.cc
+++ b/MAC/APL/VHECR/src/TBBTrigger.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/VHECR/src/VHECRTask.cc b/MAC/APL/VHECR/src/VHECRTask.cc
index 87ee2a3981d..f28dde8511c 100644
--- a/MAC/APL/VHECR/src/VHECRTask.cc
+++ b/MAC/APL/VHECR/src/VHECRTask.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/VHECR/src/VHECRsettings.cc b/MAC/APL/VHECR/src/VHECRsettings.cc
index eb5740d7011..c9b38505ef3 100644
--- a/MAC/APL/VHECR/src/VHECRsettings.cc
+++ b/MAC/APL/VHECR/src/VHECRsettings.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/APL/VHECR/test/VHECRtest.cc b/MAC/APL/VHECR/test/VHECRtest.cc
index 47ab4451890..1d6cd11bee9 100644
--- a/MAC/APL/VHECR/test/VHECRtest.cc
+++ b/MAC/APL/VHECR/test/VHECRtest.cc
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2008
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Deployment/data/Coordinates/add_field_rotation_func.sql b/MAC/Deployment/data/Coordinates/add_field_rotation_func.sql
index 4623cfc2289..c3a1a2ad575 100644
--- a/MAC/Deployment/data/Coordinates/add_field_rotation_func.sql
+++ b/MAC/Deployment/data/Coordinates/add_field_rotation_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2008
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Deployment/data/Coordinates/add_gen_coord_func.sql b/MAC/Deployment/data/Coordinates/add_gen_coord_func.sql
index f1f8dc8ab08..f66c975ef10 100644
--- a/MAC/Deployment/data/Coordinates/add_gen_coord_func.sql
+++ b/MAC/Deployment/data/Coordinates/add_gen_coord_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2008
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Deployment/data/Coordinates/add_hba_deltas_func.sql b/MAC/Deployment/data/Coordinates/add_hba_deltas_func.sql
index a75c165f8ad..0fa646cb659 100644
--- a/MAC/Deployment/data/Coordinates/add_hba_deltas_func.sql
+++ b/MAC/Deployment/data/Coordinates/add_hba_deltas_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2008
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Deployment/data/Coordinates/add_normal_vector_func.sql b/MAC/Deployment/data/Coordinates/add_normal_vector_func.sql
index d31be3b90ee..23dcdf7e30c 100644
--- a/MAC/Deployment/data/Coordinates/add_normal_vector_func.sql
+++ b/MAC/Deployment/data/Coordinates/add_normal_vector_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2008
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Deployment/data/Coordinates/add_object_func.sql b/MAC/Deployment/data/Coordinates/add_object_func.sql
index eb232c8e921..d85d3cafceb 100644
--- a/MAC/Deployment/data/Coordinates/add_object_func.sql
+++ b/MAC/Deployment/data/Coordinates/add_object_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2008
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Deployment/data/Coordinates/add_reference_coord_func.sql b/MAC/Deployment/data/Coordinates/add_reference_coord_func.sql
index b204dee2a2c..1499951f54b 100644
--- a/MAC/Deployment/data/Coordinates/add_reference_coord_func.sql
+++ b/MAC/Deployment/data/Coordinates/add_reference_coord_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2008
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Deployment/data/Coordinates/add_rotation_matrix_func.sql b/MAC/Deployment/data/Coordinates/add_rotation_matrix_func.sql
index 008b8482e19..da792c76ee5 100644
--- a/MAC/Deployment/data/Coordinates/add_rotation_matrix_func.sql
+++ b/MAC/Deployment/data/Coordinates/add_rotation_matrix_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2008
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Deployment/data/Coordinates/create_CDB_base_tables.sql b/MAC/Deployment/data/Coordinates/create_CDB_base_tables.sql
index 079fd9a629b..8de70f41126 100644
--- a/MAC/Deployment/data/Coordinates/create_CDB_base_tables.sql
+++ b/MAC/Deployment/data/Coordinates/create_CDB_base_tables.sql
@@ -3,7 +3,7 @@
 --
 -- Copyright (C) 2008
 -- ASTRON (Netherlands  Foundation for Research in Astronomy)
--- P.O.Box  2, 7990  AA Dwingeloo, The Netherlands, seg@astron.nl
+-- P.O.Box  2, 7990  AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 -- This program is   free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as  published by
diff --git a/MAC/Deployment/data/Coordinates/create_CDB_tables.sql b/MAC/Deployment/data/Coordinates/create_CDB_tables.sql
index 770f68a92fd..9d4d76d1e70 100644
--- a/MAC/Deployment/data/Coordinates/create_CDB_tables.sql
+++ b/MAC/Deployment/data/Coordinates/create_CDB_tables.sql
@@ -3,7 +3,7 @@
 --
 --	Copyright (C) 2008
 --	ASTRON (Netherlands	Foundation for Research	in Astronomy)
---	P.O.Box	2, 7990	AA Dwingeloo, The Netherlands, seg@astron.nl
+--	P.O.Box	2, 7990	AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --	This program is	free software; you can redistribute	it and/or modify
 --	it under the terms of the GNU General Public License as	published by
diff --git a/MAC/Deployment/data/Coordinates/create_CDB_types.sql b/MAC/Deployment/data/Coordinates/create_CDB_types.sql
index a1ff3bc678b..b505f69cd48 100644
--- a/MAC/Deployment/data/Coordinates/create_CDB_types.sql
+++ b/MAC/Deployment/data/Coordinates/create_CDB_types.sql
@@ -3,7 +3,7 @@
 --
 --	Copyright (C) 2008
 --	ASTRON (Netherlands	Foundation for Research	in Astronomy)
---	P.O.Box	2, 7990	AA Dwingeloo, The Netherlands, seg@astron.nl
+--	P.O.Box	2, 7990	AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --	This program is	free software; you can redistribute	it and/or modify
 --	it under the terms of the GNU General Public License as	published by
diff --git a/MAC/Deployment/data/Coordinates/get_field_rotation_func.sql b/MAC/Deployment/data/Coordinates/get_field_rotation_func.sql
index 7d044da2f43..ac29fa036b3 100644
--- a/MAC/Deployment/data/Coordinates/get_field_rotation_func.sql
+++ b/MAC/Deployment/data/Coordinates/get_field_rotation_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2008
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Deployment/data/Coordinates/get_gen_coord_func.sql b/MAC/Deployment/data/Coordinates/get_gen_coord_func.sql
index c844a0e6d67..990e4372359 100644
--- a/MAC/Deployment/data/Coordinates/get_gen_coord_func.sql
+++ b/MAC/Deployment/data/Coordinates/get_gen_coord_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2008
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Deployment/data/Coordinates/get_hba_deltas_func.sql b/MAC/Deployment/data/Coordinates/get_hba_deltas_func.sql
index 05d40ff332a..a2081bf27fe 100644
--- a/MAC/Deployment/data/Coordinates/get_hba_deltas_func.sql
+++ b/MAC/Deployment/data/Coordinates/get_hba_deltas_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2008
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Deployment/data/Coordinates/get_normal_vector_func.sql b/MAC/Deployment/data/Coordinates/get_normal_vector_func.sql
index 3f8715b2109..810bdead7cc 100644
--- a/MAC/Deployment/data/Coordinates/get_normal_vector_func.sql
+++ b/MAC/Deployment/data/Coordinates/get_normal_vector_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2008
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Deployment/data/Coordinates/get_objects_func.sql b/MAC/Deployment/data/Coordinates/get_objects_func.sql
index 3b341972067..56f3654e80a 100644
--- a/MAC/Deployment/data/Coordinates/get_objects_func.sql
+++ b/MAC/Deployment/data/Coordinates/get_objects_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2008
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Deployment/data/Coordinates/get_ref_objects_func.sql b/MAC/Deployment/data/Coordinates/get_ref_objects_func.sql
index eecffe00112..2e3246dbc65 100644
--- a/MAC/Deployment/data/Coordinates/get_ref_objects_func.sql
+++ b/MAC/Deployment/data/Coordinates/get_ref_objects_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2008
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Deployment/data/Coordinates/get_rotation_matrix_func.sql b/MAC/Deployment/data/Coordinates/get_rotation_matrix_func.sql
index a7c692e06b4..15079371b49 100644
--- a/MAC/Deployment/data/Coordinates/get_rotation_matrix_func.sql
+++ b/MAC/Deployment/data/Coordinates/get_rotation_matrix_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2008
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Deployment/data/Coordinates/get_transformation_info_func.sql b/MAC/Deployment/data/Coordinates/get_transformation_info_func.sql
index c0abf4e8aa8..3d48912c99c 100644
--- a/MAC/Deployment/data/Coordinates/get_transformation_info_func.sql
+++ b/MAC/Deployment/data/Coordinates/get_transformation_info_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2008
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Deployment/data/OTDB/create_OTDB_comps b/MAC/Deployment/data/OTDB/create_OTDB_comps
index 98d0a8c0b0c..d7b1c4a258b 100755
--- a/MAC/Deployment/data/OTDB/create_OTDB_comps
+++ b/MAC/Deployment/data/OTDB/create_OTDB_comps
@@ -4,7 +4,7 @@
 #
 # Copyright (C) 2006
 # ASTRON (Netherlands Foundation for Research in Astronomy)
-# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/MAC/Deployment/data/OTDB/loadComponents b/MAC/Deployment/data/OTDB/loadComponents
index 4544e1879b4..eb7c9d4089b 100755
--- a/MAC/Deployment/data/OTDB/loadComponents
+++ b/MAC/Deployment/data/OTDB/loadComponents
@@ -4,7 +4,7 @@
 #
 # Copyright (C) 2006-2012
 # ASTRON (Netherlands Foundation for Research in Astronomy)
-# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/MAC/Deployment/data/OTDB/loadPICtree b/MAC/Deployment/data/OTDB/loadPICtree
index f7c2e97eddf..591ed5d9b4a 100755
--- a/MAC/Deployment/data/OTDB/loadPICtree
+++ b/MAC/Deployment/data/OTDB/loadPICtree
@@ -4,7 +4,7 @@
 #
 # Copyright (C) 2006
 # ASTRON (Netherlands Foundation for Research in Astronomy)
-# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/MAC/Deployment/data/PVSS/bin/create_db_files b/MAC/Deployment/data/PVSS/bin/create_db_files
index 13674411382..00f441c0941 100755
--- a/MAC/Deployment/data/PVSS/bin/create_db_files
+++ b/MAC/Deployment/data/PVSS/bin/create_db_files
@@ -4,7 +4,7 @@
 #
 # Copyright (C) 2006
 # ASTRON (Netherlands Foundation for Research in Astronomy)
-# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/MAC/Deployment/data/bin/PVSS2SAS.cc b/MAC/Deployment/data/bin/PVSS2SAS.cc
index 020582d7211..86f6b448245 100644
--- a/MAC/Deployment/data/bin/PVSS2SAS.cc
+++ b/MAC/Deployment/data/bin/PVSS2SAS.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2008
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Deployment/data/bin/load_OTDB_comps.cc b/MAC/Deployment/data/bin/load_OTDB_comps.cc
index fca64ba2b88..6a2237f59b1 100644
--- a/MAC/Deployment/data/bin/load_OTDB_comps.cc
+++ b/MAC/Deployment/data/bin/load_OTDB_comps.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Deployment/data/bin/load_PICtree.cc b/MAC/Deployment/data/bin/load_PICtree.cc
index e78701787ef..556b92295c5 100644
--- a/MAC/Deployment/data/bin/load_PICtree.cc
+++ b/MAC/Deployment/data/bin/load_PICtree.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2008
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Drivers/spid/src/spid.c b/MAC/Drivers/spid/src/spid.c
index b5c0620a2e7..685c690acec 100755
--- a/MAC/Drivers/spid/src/spid.c
+++ b/MAC/Drivers/spid/src/spid.c
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Drivers/spid/tools/ClockSim.c b/MAC/Drivers/spid/tools/ClockSim.c
index f7bce39e54b..92d9ea5f209 100644
--- a/MAC/Drivers/spid/tools/ClockSim.c
+++ b/MAC/Drivers/spid/tools/ClockSim.c
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Drivers/spid/tools/SPIDreset.c b/MAC/Drivers/spid/tools/SPIDreset.c
index 0f1a09107b4..5684e95f391 100644
--- a/MAC/Drivers/spid/tools/SPIDreset.c
+++ b/MAC/Drivers/spid/tools/SPIDreset.c
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/LogSys/CLP/src/CLPMain.cc b/MAC/GCF/LogSys/CLP/src/CLPMain.cc
index 93afc0ad8c5..c4e5c708a99 100644
--- a/MAC/GCF/LogSys/CLP/src/CLPMain.cc
+++ b/MAC/GCF/LogSys/CLP/src/CLPMain.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/LogSys/CLP/src/CodeLoggingProcessor.cc b/MAC/GCF/LogSys/CLP/src/CodeLoggingProcessor.cc
index c957fcb7305..7acc60041fb 100644
--- a/MAC/GCF/LogSys/CLP/src/CodeLoggingProcessor.cc
+++ b/MAC/GCF/LogSys/CLP/src/CodeLoggingProcessor.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/LogSys/CLP/src/CodeLoggingProcessor.h b/MAC/GCF/LogSys/CLP/src/CodeLoggingProcessor.h
index 6b8e71f09c4..97f2fb45cf7 100644
--- a/MAC/GCF/LogSys/CLP/src/CodeLoggingProcessor.h
+++ b/MAC/GCF/LogSys/CLP/src/CodeLoggingProcessor.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/LogSys/CLP/src/PropertyProxy.cc b/MAC/GCF/LogSys/CLP/src/PropertyProxy.cc
index 57906d26174..004573d9d0d 100644
--- a/MAC/GCF/LogSys/CLP/src/PropertyProxy.cc
+++ b/MAC/GCF/LogSys/CLP/src/PropertyProxy.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/LogSys/CLP/src/PropertyProxy.h b/MAC/GCF/LogSys/CLP/src/PropertyProxy.h
index 40b49a050cf..3ee2f2748af 100644
--- a/MAC/GCF/LogSys/CLP/src/PropertyProxy.h
+++ b/MAC/GCF/LogSys/CLP/src/PropertyProxy.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/LogSys/KVLogSys/src/CEPKeyValueLogger.cc b/MAC/GCF/LogSys/KVLogSys/src/CEPKeyValueLogger.cc
index 451bfa3ef94..dcf553eccbc 100644
--- a/MAC/GCF/LogSys/KVLogSys/src/CEPKeyValueLogger.cc
+++ b/MAC/GCF/LogSys/KVLogSys/src/CEPKeyValueLogger.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/LogSys/KVLogSys/src/GCF_KeyValueLogger.cc b/MAC/GCF/LogSys/KVLogSys/src/GCF_KeyValueLogger.cc
index e0f2564dd23..a0544e1b62c 100644
--- a/MAC/GCF/LogSys/KVLogSys/src/GCF_KeyValueLogger.cc
+++ b/MAC/GCF/LogSys/KVLogSys/src/GCF_KeyValueLogger.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/LogSys/KVLogSys/src/KVLDMain.cc b/MAC/GCF/LogSys/KVLogSys/src/KVLDMain.cc
index 1007626ad4e..2bab78d9905 100644
--- a/MAC/GCF/LogSys/KVLogSys/src/KVLDMain.cc
+++ b/MAC/GCF/LogSys/KVLogSys/src/KVLDMain.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/LogSys/KVLogSys/src/KVLDefines.h b/MAC/GCF/LogSys/KVLogSys/src/KVLDefines.h
index a2c6e52c5a2..8b2bb945d21 100644
--- a/MAC/GCF/LogSys/KVLogSys/src/KVLDefines.h
+++ b/MAC/GCF/LogSys/KVLogSys/src/KVLDefines.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/LogSys/KVLogSys/src/KVLMMain.cc b/MAC/GCF/LogSys/KVLogSys/src/KVLMMain.cc
index 6011d6ae9a3..b326a1ecf30 100644
--- a/MAC/GCF/LogSys/KVLogSys/src/KVLMMain.cc
+++ b/MAC/GCF/LogSys/KVLogSys/src/KVLMMain.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/LogSys/KVLogSys/src/KVLUtils.cc b/MAC/GCF/LogSys/KVLogSys/src/KVLUtils.cc
index d33a592ff83..a1546f611f4 100644
--- a/MAC/GCF/LogSys/KVLogSys/src/KVLUtils.cc
+++ b/MAC/GCF/LogSys/KVLogSys/src/KVLUtils.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/LogSys/KVLogSys/src/KVLUtils.h b/MAC/GCF/LogSys/KVLogSys/src/KVLUtils.h
index f584daa3d66..e9665ee818b 100644
--- a/MAC/GCF/LogSys/KVLogSys/src/KVLUtils.h
+++ b/MAC/GCF/LogSys/KVLogSys/src/KVLUtils.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/LogSys/KVLogSys/src/KeyValueLoggerDaemon.cc b/MAC/GCF/LogSys/KVLogSys/src/KeyValueLoggerDaemon.cc
index bb5cc1ed1de..14d1cc8889f 100644
--- a/MAC/GCF/LogSys/KVLogSys/src/KeyValueLoggerDaemon.cc
+++ b/MAC/GCF/LogSys/KVLogSys/src/KeyValueLoggerDaemon.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/LogSys/KVLogSys/src/KeyValueLoggerDaemon.h b/MAC/GCF/LogSys/KVLogSys/src/KeyValueLoggerDaemon.h
index f26ca7c2ad4..3e6b7dd8562 100644
--- a/MAC/GCF/LogSys/KVLogSys/src/KeyValueLoggerDaemon.h
+++ b/MAC/GCF/LogSys/KVLogSys/src/KeyValueLoggerDaemon.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/LogSys/KVLogSys/src/KeyValueLoggerMaster.cc b/MAC/GCF/LogSys/KVLogSys/src/KeyValueLoggerMaster.cc
index 444ad67cf5a..9d91ca85d7b 100644
--- a/MAC/GCF/LogSys/KVLogSys/src/KeyValueLoggerMaster.cc
+++ b/MAC/GCF/LogSys/KVLogSys/src/KeyValueLoggerMaster.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/LogSys/KVLogSys/src/KeyValueLoggerMaster.h b/MAC/GCF/LogSys/KVLogSys/src/KeyValueLoggerMaster.h
index 557f949cd09..248e37a2416 100644
--- a/MAC/GCF/LogSys/KVLogSys/src/KeyValueLoggerMaster.h
+++ b/MAC/GCF/LogSys/KVLogSys/src/KeyValueLoggerMaster.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/LogSys/KVLogSys/src/PropertyLogger.cc b/MAC/GCF/LogSys/KVLogSys/src/PropertyLogger.cc
index 42529e63f4c..c6c96edbc64 100644
--- a/MAC/GCF/LogSys/KVLogSys/src/PropertyLogger.cc
+++ b/MAC/GCF/LogSys/KVLogSys/src/PropertyLogger.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/LogSys/KVLogSys/src/PropertyLogger.h b/MAC/GCF/LogSys/KVLogSys/src/PropertyLogger.h
index 40141a065ed..e3a62abdc96 100644
--- a/MAC/GCF/LogSys/KVLogSys/src/PropertyLogger.h
+++ b/MAC/GCF/LogSys/KVLogSys/src/PropertyLogger.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/LogSys/KVLogSys/test/tKVLlogger.cc b/MAC/GCF/LogSys/KVLogSys/test/tKVLlogger.cc
index b7fdf043b22..dfffba23890 100644
--- a/MAC/GCF/LogSys/KVLogSys/test/tKVLlogger.cc
+++ b/MAC/GCF/LogSys/KVLogSys/test/tKVLlogger.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/LogSys/include/GCF/LogSys/CEPKeyValueLogger.h b/MAC/GCF/LogSys/include/GCF/LogSys/CEPKeyValueLogger.h
index 06a2c5eded7..05f24cc3292 100644
--- a/MAC/GCF/LogSys/include/GCF/LogSys/CEPKeyValueLogger.h
+++ b/MAC/GCF/LogSys/include/GCF/LogSys/CEPKeyValueLogger.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/LogSys/include/GCF/LogSys/GCF_KeyValueLogger.h b/MAC/GCF/LogSys/include/GCF/LogSys/GCF_KeyValueLogger.h
index ab9f74a6178..5cad2cb3488 100644
--- a/MAC/GCF/LogSys/include/GCF/LogSys/GCF_KeyValueLogger.h
+++ b/MAC/GCF/LogSys/include/GCF/LogSys/GCF_KeyValueLogger.h
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/include/GCF/PVSS/GCF_Defines.h b/MAC/GCF/PVSS/include/GCF/PVSS/GCF_Defines.h
index f4429319b6f..781a7c6d7eb 100644
--- a/MAC/GCF/PVSS/include/GCF/PVSS/GCF_Defines.h
+++ b/MAC/GCF/PVSS/include/GCF/PVSS/GCF_Defines.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVBlob.h b/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVBlob.h
index 99be0f09b1c..d2ae9bf213f 100644
--- a/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVBlob.h
+++ b/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVBlob.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVBool.h b/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVBool.h
index bf20aef5d11..da685ccac7e 100644
--- a/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVBool.h
+++ b/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVBool.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVChar.h b/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVChar.h
index d2bd976a745..e0a73c8c9a8 100644
--- a/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVChar.h
+++ b/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVChar.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVDateTime.h b/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVDateTime.h
index 30480dd19d9..7a0e6bf0e94 100644
--- a/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVDateTime.h
+++ b/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVDateTime.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2008
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVDouble.h b/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVDouble.h
index a4fe7d5e58e..2a65aeb0b1b 100644
--- a/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVDouble.h
+++ b/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVDouble.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVDynArr.h b/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVDynArr.h
index ccb0c3e731d..77e6b4876ad 100644
--- a/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVDynArr.h
+++ b/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVDynArr.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVInteger.h b/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVInteger.h
index 8d67ea65765..cca6868c0a4 100644
--- a/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVInteger.h
+++ b/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVInteger.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVString.h b/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVString.h
index fba06e4077d..2d59abe211d 100644
--- a/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVString.h
+++ b/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVString.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVTypes.h b/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVTypes.h
index c4b6808b27e..56e7452f9c0 100644
--- a/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVTypes.h
+++ b/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVTypes.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVUnsigned.h b/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVUnsigned.h
index 1348f0fd338..5911fdd65d4 100644
--- a/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVUnsigned.h
+++ b/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PVUnsigned.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PValue.h b/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PValue.h
index 955e73dc1c7..d26d69713d3 100644
--- a/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PValue.h
+++ b/MAC/GCF/PVSS/include/GCF/PVSS/GCF_PValue.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/include/GCF/PVSS/PVSSinfo.h b/MAC/GCF/PVSS/include/GCF/PVSS/PVSSinfo.h
index e983c1f39ef..142d0a4a143 100644
--- a/MAC/GCF/PVSS/include/GCF/PVSS/PVSSinfo.h
+++ b/MAC/GCF/PVSS/include/GCF/PVSS/PVSSinfo.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/include/GCF/PVSS/PVSSresponse.h b/MAC/GCF/PVSS/include/GCF/PVSS/PVSSresponse.h
index 6baf13beadc..202467d4ae4 100644
--- a/MAC/GCF/PVSS/include/GCF/PVSS/PVSSresponse.h
+++ b/MAC/GCF/PVSS/include/GCF/PVSS/PVSSresponse.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2008
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/include/GCF/PVSS/PVSSresult.h b/MAC/GCF/PVSS/include/GCF/PVSS/PVSSresult.h
index 8b4b4d18c31..087213fa6d7 100644
--- a/MAC/GCF/PVSS/include/GCF/PVSS/PVSSresult.h
+++ b/MAC/GCF/PVSS/include/GCF/PVSS/PVSSresult.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/include/GCF/PVSS/PVSSservice.h b/MAC/GCF/PVSS/include/GCF/PVSS/PVSSservice.h
index d2b7b54a06e..48197a60f5b 100644
--- a/MAC/GCF/PVSS/include/GCF/PVSS/PVSSservice.h
+++ b/MAC/GCF/PVSS/include/GCF/PVSS/PVSSservice.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2008
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/src/GCF_DynTypes.h b/MAC/GCF/PVSS/src/GCF_DynTypes.h
index 34041f2dc49..40bf4c148c8 100644
--- a/MAC/GCF/PVSS/src/GCF_DynTypes.h
+++ b/MAC/GCF/PVSS/src/GCF_DynTypes.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2011
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/src/GCF_PVBlob.cc b/MAC/GCF/PVSS/src/GCF_PVBlob.cc
index 0b3690a5219..3f4ff273c72 100644
--- a/MAC/GCF/PVSS/src/GCF_PVBlob.cc
+++ b/MAC/GCF/PVSS/src/GCF_PVBlob.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/src/GCF_PVBool.cc b/MAC/GCF/PVSS/src/GCF_PVBool.cc
index 056ba6958bf..f1edcc7bd98 100644
--- a/MAC/GCF/PVSS/src/GCF_PVBool.cc
+++ b/MAC/GCF/PVSS/src/GCF_PVBool.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/src/GCF_PVChar.cc b/MAC/GCF/PVSS/src/GCF_PVChar.cc
index 35cde284783..7a63d9cd1a8 100644
--- a/MAC/GCF/PVSS/src/GCF_PVChar.cc
+++ b/MAC/GCF/PVSS/src/GCF_PVChar.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/src/GCF_PVDateTime.cc b/MAC/GCF/PVSS/src/GCF_PVDateTime.cc
index a286ead47bd..658b12dbe46 100644
--- a/MAC/GCF/PVSS/src/GCF_PVDateTime.cc
+++ b/MAC/GCF/PVSS/src/GCF_PVDateTime.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2008
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/src/GCF_PVDouble.cc b/MAC/GCF/PVSS/src/GCF_PVDouble.cc
index 99b0b93da35..7a433116e06 100644
--- a/MAC/GCF/PVSS/src/GCF_PVDouble.cc
+++ b/MAC/GCF/PVSS/src/GCF_PVDouble.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/src/GCF_PVDynArr.cc b/MAC/GCF/PVSS/src/GCF_PVDynArr.cc
index 0c8765f2d0a..56947b2ac0c 100644
--- a/MAC/GCF/PVSS/src/GCF_PVDynArr.cc
+++ b/MAC/GCF/PVSS/src/GCF_PVDynArr.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2008
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/src/GCF_PVInteger.cc b/MAC/GCF/PVSS/src/GCF_PVInteger.cc
index 7ea35dea090..79dc016b266 100644
--- a/MAC/GCF/PVSS/src/GCF_PVInteger.cc
+++ b/MAC/GCF/PVSS/src/GCF_PVInteger.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/src/GCF_PVString.cc b/MAC/GCF/PVSS/src/GCF_PVString.cc
index 1e2fe2b3fa4..8886f20da70 100644
--- a/MAC/GCF/PVSS/src/GCF_PVString.cc
+++ b/MAC/GCF/PVSS/src/GCF_PVString.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/src/GCF_PVTypes.cc b/MAC/GCF/PVSS/src/GCF_PVTypes.cc
index 97ba0606b0b..809de5ce239 100644
--- a/MAC/GCF/PVSS/src/GCF_PVTypes.cc
+++ b/MAC/GCF/PVSS/src/GCF_PVTypes.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2014
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/src/GCF_PVUnsigned.cc b/MAC/GCF/PVSS/src/GCF_PVUnsigned.cc
index 3b5632edeac..ce8cd6a69e1 100644
--- a/MAC/GCF/PVSS/src/GCF_PVUnsigned.cc
+++ b/MAC/GCF/PVSS/src/GCF_PVUnsigned.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/src/GCF_PValue.cc b/MAC/GCF/PVSS/src/GCF_PValue.cc
index b8dabaeff13..89f061c2b35 100644
--- a/MAC/GCF/PVSS/src/GCF_PValue.cc
+++ b/MAC/GCF/PVSS/src/GCF_PValue.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/src/GSA_PvssApi.cc b/MAC/GCF/PVSS/src/GSA_PvssApi.cc
index 8678d6854a2..8e3ee4ee33e 100644
--- a/MAC/GCF/PVSS/src/GSA_PvssApi.cc
+++ b/MAC/GCF/PVSS/src/GSA_PvssApi.cc
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/src/GSA_PvssApi.h b/MAC/GCF/PVSS/src/GSA_PvssApi.h
index a20e647a23e..4aea36a974f 100644
--- a/MAC/GCF/PVSS/src/GSA_PvssApi.h
+++ b/MAC/GCF/PVSS/src/GSA_PvssApi.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/src/GSA_Resources.cc b/MAC/GCF/PVSS/src/GSA_Resources.cc
index 6c24cb0df00..31a3b4c1361 100644
--- a/MAC/GCF/PVSS/src/GSA_Resources.cc
+++ b/MAC/GCF/PVSS/src/GSA_Resources.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/src/GSA_Resources.h b/MAC/GCF/PVSS/src/GSA_Resources.h
index 2ac96b394bf..2bde4baafa9 100644
--- a/MAC/GCF/PVSS/src/GSA_Resources.h
+++ b/MAC/GCF/PVSS/src/GSA_Resources.h
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/src/GSA_SCADAHandler.cc b/MAC/GCF/PVSS/src/GSA_SCADAHandler.cc
index 7a474ac914f..52d24ddc882 100644
--- a/MAC/GCF/PVSS/src/GSA_SCADAHandler.cc
+++ b/MAC/GCF/PVSS/src/GSA_SCADAHandler.cc
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/src/GSA_SCADAHandler.h b/MAC/GCF/PVSS/src/GSA_SCADAHandler.h
index 2c11b0bd719..9f887f2aaa4 100644
--- a/MAC/GCF/PVSS/src/GSA_SCADAHandler.h
+++ b/MAC/GCF/PVSS/src/GSA_SCADAHandler.h
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/src/GSA_WaitForAnswer.h b/MAC/GCF/PVSS/src/GSA_WaitForAnswer.h
index 9a572b3c886..576bdd00b26 100644
--- a/MAC/GCF/PVSS/src/GSA_WaitForAnswer.h
+++ b/MAC/GCF/PVSS/src/GSA_WaitForAnswer.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/src/PVSSinfo.cc b/MAC/GCF/PVSS/src/PVSSinfo.cc
index f4b961239a8..21d7e92b6e3 100644
--- a/MAC/GCF/PVSS/src/PVSSinfo.cc
+++ b/MAC/GCF/PVSS/src/PVSSinfo.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/src/PVSSservice.cc b/MAC/GCF/PVSS/src/PVSSservice.cc
index 53ad7269e7a..c7e1164c0b6 100644
--- a/MAC/GCF/PVSS/src/PVSSservice.cc
+++ b/MAC/GCF/PVSS/src/PVSSservice.cc
@@ -2,7 +2,7 @@
 //#
 //# Copyright (C) 2002-2003
 //# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //# This program is free software; you can redistribute it and/or modify
 //# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/test/PerformanceResponse.h b/MAC/GCF/PVSS/test/PerformanceResponse.h
index aa9e6d2d84e..e1047388281 100644
--- a/MAC/GCF/PVSS/test/PerformanceResponse.h
+++ b/MAC/GCF/PVSS/test/PerformanceResponse.h
@@ -2,7 +2,7 @@
 //
 //  Copyright (C) 2007
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/test/Response.h b/MAC/GCF/PVSS/test/Response.h
index f966d022586..54c7875e29e 100644
--- a/MAC/GCF/PVSS/test/Response.h
+++ b/MAC/GCF/PVSS/test/Response.h
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/test/tGCFtypes.cc b/MAC/GCF/PVSS/test/tGCFtypes.cc
index 1b825a935f9..4c584598d48 100644
--- a/MAC/GCF/PVSS/test/tGCFtypes.cc
+++ b/MAC/GCF/PVSS/test/tGCFtypes.cc
@@ -2,7 +2,7 @@
 //
 //  Copyright (C) 2007
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/test/tMonitorState.cc b/MAC/GCF/PVSS/test/tMonitorState.cc
index 128ad5b288e..325522aee11 100644
--- a/MAC/GCF/PVSS/test/tMonitorState.cc
+++ b/MAC/GCF/PVSS/test/tMonitorState.cc
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2008
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/test/tMonitorState.h b/MAC/GCF/PVSS/test/tMonitorState.h
index d58b05d23a2..eb3be621f2c 100644
--- a/MAC/GCF/PVSS/test/tMonitorState.h
+++ b/MAC/GCF/PVSS/test/tMonitorState.h
@@ -2,7 +2,7 @@
 //
 //  Copyright (C) 2008
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/test/tPVSSconnect.cc b/MAC/GCF/PVSS/test/tPVSSconnect.cc
index b8703f3e4d9..c963c49f44b 100644
--- a/MAC/GCF/PVSS/test/tPVSSconnect.cc
+++ b/MAC/GCF/PVSS/test/tPVSSconnect.cc
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2008
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/test/tPVSSinfo.cc b/MAC/GCF/PVSS/test/tPVSSinfo.cc
index 705b356465c..d8962db9a1d 100644
--- a/MAC/GCF/PVSS/test/tPVSSinfo.cc
+++ b/MAC/GCF/PVSS/test/tPVSSinfo.cc
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2008
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/test/tPVSSinfo.h b/MAC/GCF/PVSS/test/tPVSSinfo.h
index cc16955ff86..3cec561a2f8 100644
--- a/MAC/GCF/PVSS/test/tPVSSinfo.h
+++ b/MAC/GCF/PVSS/test/tPVSSinfo.h
@@ -2,7 +2,7 @@
 //
 //  Copyright (C) 2008
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/test/tPVSSservice.cc b/MAC/GCF/PVSS/test/tPVSSservice.cc
index fc0e09b2db6..2911092340c 100644
--- a/MAC/GCF/PVSS/test/tPVSSservice.cc
+++ b/MAC/GCF/PVSS/test/tPVSSservice.cc
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/test/tPVSSservice.h b/MAC/GCF/PVSS/test/tPVSSservice.h
index e37215c3a1b..6a054702a4f 100644
--- a/MAC/GCF/PVSS/test/tPVSSservice.h
+++ b/MAC/GCF/PVSS/test/tPVSSservice.h
@@ -2,7 +2,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/test/tPerformance.cc b/MAC/GCF/PVSS/test/tPerformance.cc
index 2f643ed7b76..5922b305885 100644
--- a/MAC/GCF/PVSS/test/tPerformance.cc
+++ b/MAC/GCF/PVSS/test/tPerformance.cc
@@ -2,7 +2,7 @@
 //
 //  Copyright (C) 2007
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/PVSS/test/tPerformance.h b/MAC/GCF/PVSS/test/tPerformance.h
index 84d34bcc5dd..a1e0c3f53c5 100644
--- a/MAC/GCF/PVSS/test/tPerformance.h
+++ b/MAC/GCF/PVSS/test/tPerformance.h
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/RTDB/include/GCF/RTDB/DPservice.h b/MAC/GCF/RTDB/include/GCF/RTDB/DPservice.h
index e56dbf589e7..2addbfa3ffd 100644
--- a/MAC/GCF/RTDB/include/GCF/RTDB/DPservice.h
+++ b/MAC/GCF/RTDB/include/GCF/RTDB/DPservice.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/RTDB/include/GCF/RTDB/GCF_RTDBPort.h b/MAC/GCF/RTDB/include/GCF/RTDB/GCF_RTDBPort.h
index 9c5d871f1a8..87c1b30a6a3 100644
--- a/MAC/GCF/RTDB/include/GCF/RTDB/GCF_RTDBPort.h
+++ b/MAC/GCF/RTDB/include/GCF/RTDB/GCF_RTDBPort.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2011
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/RTDB/include/GCF/RTDB/RTDB_PropertySet.h b/MAC/GCF/RTDB/include/GCF/RTDB/RTDB_PropertySet.h
index d58a32480b7..5cd09114b73 100644
--- a/MAC/GCF/RTDB/include/GCF/RTDB/RTDB_PropertySet.h
+++ b/MAC/GCF/RTDB/include/GCF/RTDB/RTDB_PropertySet.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/RTDB/src/DP_Protocol.prot b/MAC/GCF/RTDB/src/DP_Protocol.prot
index 78e9930c6cf..acbbd6f864b 100644
--- a/MAC/GCF/RTDB/src/DP_Protocol.prot
+++ b/MAC/GCF/RTDB/src/DP_Protocol.prot
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/RTDB/src/DPanswer.cc b/MAC/GCF/RTDB/src/DPanswer.cc
index ba638b1f5c4..8b334e631fa 100644
--- a/MAC/GCF/RTDB/src/DPanswer.cc
+++ b/MAC/GCF/RTDB/src/DPanswer.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/RTDB/src/DPanswer.h b/MAC/GCF/RTDB/src/DPanswer.h
index e425cd277a1..872eb40a88a 100644
--- a/MAC/GCF/RTDB/src/DPanswer.h
+++ b/MAC/GCF/RTDB/src/DPanswer.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/RTDB/src/DPresponse.h b/MAC/GCF/RTDB/src/DPresponse.h
index c3f92f07f6d..b8a8cc722c4 100644
--- a/MAC/GCF/RTDB/src/DPresponse.h
+++ b/MAC/GCF/RTDB/src/DPresponse.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/RTDB/src/DPservice.cc b/MAC/GCF/RTDB/src/DPservice.cc
index 529b86739e7..7f6a24a32ad 100644
--- a/MAC/GCF/RTDB/src/DPservice.cc
+++ b/MAC/GCF/RTDB/src/DPservice.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/RTDB/src/GCF_RTDBPort.cc b/MAC/GCF/RTDB/src/GCF_RTDBPort.cc
index 8e3456a5166..25726448b5a 100644
--- a/MAC/GCF/RTDB/src/GCF_RTDBPort.cc
+++ b/MAC/GCF/RTDB/src/GCF_RTDBPort.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2011
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/RTDB/src/PortResponse.h b/MAC/GCF/RTDB/src/PortResponse.h
index 7e493c7ebf9..9c274b678eb 100644
--- a/MAC/GCF/RTDB/src/PortResponse.h
+++ b/MAC/GCF/RTDB/src/PortResponse.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2007-2011
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/RTDB/src/PropSetResponse.h b/MAC/GCF/RTDB/src/PropSetResponse.h
index 30c801409b4..6888a0a9243 100644
--- a/MAC/GCF/RTDB/src/PropSetResponse.h
+++ b/MAC/GCF/RTDB/src/PropSetResponse.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/RTDB/src/RTDB_PropertySet.cc b/MAC/GCF/RTDB/src/RTDB_PropertySet.cc
index 05dc03c741e..0e1d57961fa 100644
--- a/MAC/GCF/RTDB/src/RTDB_PropertySet.cc
+++ b/MAC/GCF/RTDB/src/RTDB_PropertySet.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/RTDB/test/DPresponse.h b/MAC/GCF/RTDB/test/DPresponse.h
index e21d083d4e9..dff25396d7c 100644
--- a/MAC/GCF/RTDB/test/DPresponse.h
+++ b/MAC/GCF/RTDB/test/DPresponse.h
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/RTDB/test/RTDBPerfResp.h b/MAC/GCF/RTDB/test/RTDBPerfResp.h
index 45c598c2272..892814d7d5b 100644
--- a/MAC/GCF/RTDB/test/RTDBPerfResp.h
+++ b/MAC/GCF/RTDB/test/RTDBPerfResp.h
@@ -2,7 +2,7 @@
 //
 //  Copyright (C) 2007
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/RTDB/test/tDPservice.cc b/MAC/GCF/RTDB/test/tDPservice.cc
index 828332ae6bc..5d915b54c50 100644
--- a/MAC/GCF/RTDB/test/tDPservice.cc
+++ b/MAC/GCF/RTDB/test/tDPservice.cc
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2007
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/RTDB/test/tDPservice.h b/MAC/GCF/RTDB/test/tDPservice.h
index 51099722dcb..797e94d702d 100644
--- a/MAC/GCF/RTDB/test/tDPservice.h
+++ b/MAC/GCF/RTDB/test/tDPservice.h
@@ -2,7 +2,7 @@
 //
 //  Copyright (C) 2007
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/RTDB/test/tPerformanceReport.cc b/MAC/GCF/RTDB/test/tPerformanceReport.cc
index 4ed522aa07d..8c1673961f2 100644
--- a/MAC/GCF/RTDB/test/tPerformanceReport.cc
+++ b/MAC/GCF/RTDB/test/tPerformanceReport.cc
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2008
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/RTDB/test/tPerformanceReport.h b/MAC/GCF/RTDB/test/tPerformanceReport.h
index 12d3baa0b1c..7379c5dd2b2 100644
--- a/MAC/GCF/RTDB/test/tPerformanceReport.h
+++ b/MAC/GCF/RTDB/test/tPerformanceReport.h
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2007
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/RTDB/test/tPropertySet.cc b/MAC/GCF/RTDB/test/tPropertySet.cc
index d159ca3546e..252df33a5c9 100644
--- a/MAC/GCF/RTDB/test/tPropertySet.cc
+++ b/MAC/GCF/RTDB/test/tPropertySet.cc
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2007
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/RTDB/test/tPropertySet.h b/MAC/GCF/RTDB/test/tPropertySet.h
index e49e5083ecd..450d73299b1 100644
--- a/MAC/GCF/RTDB/test/tPropertySet.h
+++ b/MAC/GCF/RTDB/test/tPropertySet.h
@@ -2,7 +2,7 @@
 //
 //  Copyright (C) 2007
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/RTDB/test/tRTDBPerformance.cc b/MAC/GCF/RTDB/test/tRTDBPerformance.cc
index 49f84f0342c..59e03e2db51 100644
--- a/MAC/GCF/RTDB/test/tRTDBPerformance.cc
+++ b/MAC/GCF/RTDB/test/tRTDBPerformance.cc
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2007
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/RTDB/test/tRTDBPerformance.h b/MAC/GCF/RTDB/test/tRTDBPerformance.h
index cf522895be7..babd7af2bd3 100644
--- a/MAC/GCF/RTDB/test/tRTDBPerformance.h
+++ b/MAC/GCF/RTDB/test/tRTDBPerformance.h
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2007
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/RTDB/test/tRTDBPort.cc b/MAC/GCF/RTDB/test/tRTDBPort.cc
index 2f02645d341..6dd5a136535 100644
--- a/MAC/GCF/RTDB/test/tRTDBPort.cc
+++ b/MAC/GCF/RTDB/test/tRTDBPort.cc
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2007
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/RTDB/test/tRTDBPort.h b/MAC/GCF/RTDB/test/tRTDBPort.h
index 6e54efb1568..1ba769d8acc 100644
--- a/MAC/GCF/RTDB/test/tRTDBPort.h
+++ b/MAC/GCF/RTDB/test/tRTDBPort.h
@@ -2,7 +2,7 @@
 //
 //  Copyright (C) 2007
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/RTDB/test/testQuery.cc b/MAC/GCF/RTDB/test/testQuery.cc
index cc92152e896..17a7480673e 100644
--- a/MAC/GCF/RTDB/test/testQuery.cc
+++ b/MAC/GCF/RTDB/test/testQuery.cc
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2007
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/RTDB/test/testQuery.h b/MAC/GCF/RTDB/test/testQuery.h
index 1e89f310c0a..a4abc7aedb2 100644
--- a/MAC/GCF/RTDB/test/testQuery.h
+++ b/MAC/GCF/RTDB/test/testQuery.h
@@ -2,7 +2,7 @@
 //
 //  Copyright (C) 2007
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/include/GCF/TM/GCF_Control.h b/MAC/GCF/TM/include/GCF/TM/GCF_Control.h
index 503b4e62826..1a448ee6442 100644
--- a/MAC/GCF/TM/include/GCF/TM/GCF_Control.h
+++ b/MAC/GCF/TM/include/GCF/TM/GCF_Control.h
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/include/GCF/TM/GCF_DevicePort.h b/MAC/GCF/TM/include/GCF/TM/GCF_DevicePort.h
index 10bdb59ad08..f21143501d1 100644
--- a/MAC/GCF/TM/include/GCF/TM/GCF_DevicePort.h
+++ b/MAC/GCF/TM/include/GCF/TM/GCF_DevicePort.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/include/GCF/TM/GCF_ETHRawPort.h b/MAC/GCF/TM/include/GCF/TM/GCF_ETHRawPort.h
index 80c171a43bf..2d7230ccd8e 100644
--- a/MAC/GCF/TM/include/GCF/TM/GCF_ETHRawPort.h
+++ b/MAC/GCF/TM/include/GCF/TM/GCF_ETHRawPort.h
@@ -2,7 +2,7 @@
 //#
 //# Copyright (C) 2003
 //# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //# This program is free software; you can redistribute it and/or modify
 //# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/include/GCF/TM/GCF_Fsm.h b/MAC/GCF/TM/include/GCF/TM/GCF_Fsm.h
index e1cb947237d..8da21157eb6 100644
--- a/MAC/GCF/TM/include/GCF/TM/GCF_Fsm.h
+++ b/MAC/GCF/TM/include/GCF/TM/GCF_Fsm.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/include/GCF/TM/GCF_Handler.h b/MAC/GCF/TM/include/GCF/TM/GCF_Handler.h
index 5cbc4f62ee9..8d12fcd9b73 100644
--- a/MAC/GCF/TM/include/GCF/TM/GCF_Handler.h
+++ b/MAC/GCF/TM/include/GCF/TM/GCF_Handler.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/include/GCF/TM/GCF_ITCPort.h b/MAC/GCF/TM/include/GCF/TM/GCF_ITCPort.h
index 78035be063c..55fa858b879 100644
--- a/MAC/GCF/TM/include/GCF/TM/GCF_ITCPort.h
+++ b/MAC/GCF/TM/include/GCF/TM/GCF_ITCPort.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/include/GCF/TM/GCF_Port.h b/MAC/GCF/TM/include/GCF/TM/GCF_Port.h
index 5fcc0b89ea5..c786e4efdd9 100644
--- a/MAC/GCF/TM/include/GCF/TM/GCF_Port.h
+++ b/MAC/GCF/TM/include/GCF/TM/GCF_Port.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/include/GCF/TM/GCF_PortInterface.h b/MAC/GCF/TM/include/GCF/TM/GCF_PortInterface.h
index d0771461156..551ae31022e 100644
--- a/MAC/GCF/TM/include/GCF/TM/GCF_PortInterface.h
+++ b/MAC/GCF/TM/include/GCF/TM/GCF_PortInterface.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/include/GCF/TM/GCF_Protocols.h b/MAC/GCF/TM/include/GCF/TM/GCF_Protocols.h
index b422125780f..660fde1ac93 100644
--- a/MAC/GCF/TM/include/GCF/TM/GCF_Protocols.h
+++ b/MAC/GCF/TM/include/GCF/TM/GCF_Protocols.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/include/GCF/TM/GCF_RawPort.h b/MAC/GCF/TM/include/GCF/TM/GCF_RawPort.h
index c95f9110057..21e88d318c4 100644
--- a/MAC/GCF/TM/include/GCF/TM/GCF_RawPort.h
+++ b/MAC/GCF/TM/include/GCF/TM/GCF_RawPort.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/include/GCF/TM/GCF_Scheduler.h b/MAC/GCF/TM/include/GCF/TM/GCF_Scheduler.h
index 1b0e6365077..ccecc8eac3e 100644
--- a/MAC/GCF/TM/include/GCF/TM/GCF_Scheduler.h
+++ b/MAC/GCF/TM/include/GCF/TM/GCF_Scheduler.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/include/GCF/TM/GCF_TCPPort.h b/MAC/GCF/TM/include/GCF/TM/GCF_TCPPort.h
index 36c3fe5f19a..21f853a2324 100644
--- a/MAC/GCF/TM/include/GCF/TM/GCF_TCPPort.h
+++ b/MAC/GCF/TM/include/GCF/TM/GCF_TCPPort.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/include/GCF/TM/GCF_Task.h b/MAC/GCF/TM/include/GCF/TM/GCF_Task.h
index 298b06f7066..bd1d6359803 100644
--- a/MAC/GCF/TM/include/GCF/TM/GCF_Task.h
+++ b/MAC/GCF/TM/include/GCF/TM/GCF_Task.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/include/GCF/TM/GCF_TimerPort.h b/MAC/GCF/TM/include/GCF/TM/GCF_TimerPort.h
index 7c53e95a41a..d42c351a80e 100644
--- a/MAC/GCF/TM/include/GCF/TM/GCF_TimerPort.h
+++ b/MAC/GCF/TM/include/GCF/TM/GCF_TimerPort.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/include/GCF/TM/TestTask.h b/MAC/GCF/TM/include/GCF/TM/TestTask.h
index f745e3c25ff..d71112fb80d 100644
--- a/MAC/GCF/TM/include/GCF/TM/TestTask.h
+++ b/MAC/GCF/TM/include/GCF/TM/TestTask.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2010-2011
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/GCF_Fsm.cc b/MAC/GCF/TM/src/GCF_Fsm.cc
index 7fb45ef5137..37c6ff99c69 100644
--- a/MAC/GCF/TM/src/GCF_Fsm.cc
+++ b/MAC/GCF/TM/src/GCF_Fsm.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/GCF_Handler.cc b/MAC/GCF/TM/src/GCF_Handler.cc
index 9896cc8a695..d82de365b94 100644
--- a/MAC/GCF/TM/src/GCF_Handler.cc
+++ b/MAC/GCF/TM/src/GCF_Handler.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2009
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/GCF_Protocols.cc b/MAC/GCF/TM/src/GCF_Protocols.cc
index 18b8710d2c3..3a8c03a15b4 100644
--- a/MAC/GCF/TM/src/GCF_Protocols.cc
+++ b/MAC/GCF/TM/src/GCF_Protocols.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/GCF_Scheduler.cc b/MAC/GCF/TM/src/GCF_Scheduler.cc
index fb275f3a2e6..f63e3676261 100644
--- a/MAC/GCF/TM/src/GCF_Scheduler.cc
+++ b/MAC/GCF/TM/src/GCF_Scheduler.cc
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/GTM_Defines.h b/MAC/GCF/TM/src/GTM_Defines.h
index bcf7ff2dd99..d92a5223530 100644
--- a/MAC/GCF/TM/src/GTM_Defines.h
+++ b/MAC/GCF/TM/src/GTM_Defines.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/Port/GCF_Port.cc b/MAC/GCF/TM/src/Port/GCF_Port.cc
index 2043a672a07..969ff84c42a 100644
--- a/MAC/GCF/TM/src/Port/GCF_Port.cc
+++ b/MAC/GCF/TM/src/Port/GCF_Port.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/Port/GCF_PortInterface.cc b/MAC/GCF/TM/src/Port/GCF_PortInterface.cc
index f81e217b8f2..070c9cf6fac 100644
--- a/MAC/GCF/TM/src/Port/GCF_PortInterface.cc
+++ b/MAC/GCF/TM/src/Port/GCF_PortInterface.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/Port/GCF_RawPort.cc b/MAC/GCF/TM/src/Port/GCF_RawPort.cc
index 14ecd90bfa4..ca79d25f8bb 100644
--- a/MAC/GCF/TM/src/Port/GCF_RawPort.cc
+++ b/MAC/GCF/TM/src/Port/GCF_RawPort.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/PortImpl/GCF_DevicePort.cc b/MAC/GCF/TM/src/PortImpl/GCF_DevicePort.cc
index b30c0b20b39..c61ce654aa6 100644
--- a/MAC/GCF/TM/src/PortImpl/GCF_DevicePort.cc
+++ b/MAC/GCF/TM/src/PortImpl/GCF_DevicePort.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/PortImpl/GCF_ETHRawPort.cc b/MAC/GCF/TM/src/PortImpl/GCF_ETHRawPort.cc
index 458507c68c9..becb20d4f89 100644
--- a/MAC/GCF/TM/src/PortImpl/GCF_ETHRawPort.cc
+++ b/MAC/GCF/TM/src/PortImpl/GCF_ETHRawPort.cc
@@ -2,7 +2,7 @@
 //#
 //# Copyright (C) 2003
 //# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //# This program is free software; you can redistribute it and/or modify
 //# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/PortImpl/GCF_ITCPort.cc b/MAC/GCF/TM/src/PortImpl/GCF_ITCPort.cc
index cabd719f65c..29a22f1d845 100644
--- a/MAC/GCF/TM/src/PortImpl/GCF_ITCPort.cc
+++ b/MAC/GCF/TM/src/PortImpl/GCF_ITCPort.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/PortImpl/GCF_TCPPort.cc b/MAC/GCF/TM/src/PortImpl/GCF_TCPPort.cc
index 17123057310..2b56e883d5d 100644
--- a/MAC/GCF/TM/src/PortImpl/GCF_TCPPort.cc
+++ b/MAC/GCF/TM/src/PortImpl/GCF_TCPPort.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/PortImpl/GTM_Device.cc b/MAC/GCF/TM/src/PortImpl/GTM_Device.cc
index e46194dac10..19eba56493f 100644
--- a/MAC/GCF/TM/src/PortImpl/GTM_Device.cc
+++ b/MAC/GCF/TM/src/PortImpl/GTM_Device.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/PortImpl/GTM_Device.h b/MAC/GCF/TM/src/PortImpl/GTM_Device.h
index f95f3051cd1..50009fc4b86 100644
--- a/MAC/GCF/TM/src/PortImpl/GTM_Device.h
+++ b/MAC/GCF/TM/src/PortImpl/GTM_Device.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/PortImpl/GTM_ETHSocket.cc b/MAC/GCF/TM/src/PortImpl/GTM_ETHSocket.cc
index 6f8942c7129..cfff1a98bbb 100644
--- a/MAC/GCF/TM/src/PortImpl/GTM_ETHSocket.cc
+++ b/MAC/GCF/TM/src/PortImpl/GTM_ETHSocket.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/PortImpl/GTM_ETHSocket.h b/MAC/GCF/TM/src/PortImpl/GTM_ETHSocket.h
index 5244ef2027c..1db172af1d3 100644
--- a/MAC/GCF/TM/src/PortImpl/GTM_ETHSocket.h
+++ b/MAC/GCF/TM/src/PortImpl/GTM_ETHSocket.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/PortImpl/GTM_File.cc b/MAC/GCF/TM/src/PortImpl/GTM_File.cc
index a4366947118..4ac40622c3c 100644
--- a/MAC/GCF/TM/src/PortImpl/GTM_File.cc
+++ b/MAC/GCF/TM/src/PortImpl/GTM_File.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/PortImpl/GTM_File.h b/MAC/GCF/TM/src/PortImpl/GTM_File.h
index 6fcd89a80b5..2ec94d08a6a 100644
--- a/MAC/GCF/TM/src/PortImpl/GTM_File.h
+++ b/MAC/GCF/TM/src/PortImpl/GTM_File.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/PortImpl/GTM_FileHandler.cc b/MAC/GCF/TM/src/PortImpl/GTM_FileHandler.cc
index a4dce1f9eb8..9db328d0e24 100644
--- a/MAC/GCF/TM/src/PortImpl/GTM_FileHandler.cc
+++ b/MAC/GCF/TM/src/PortImpl/GTM_FileHandler.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/PortImpl/GTM_FileHandler.h b/MAC/GCF/TM/src/PortImpl/GTM_FileHandler.h
index 130c3c9401f..82bd97480ec 100644
--- a/MAC/GCF/TM/src/PortImpl/GTM_FileHandler.h
+++ b/MAC/GCF/TM/src/PortImpl/GTM_FileHandler.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/PortImpl/GTM_TCPServerSocket.cc b/MAC/GCF/TM/src/PortImpl/GTM_TCPServerSocket.cc
index ecec7ec8eea..391552695bd 100644
--- a/MAC/GCF/TM/src/PortImpl/GTM_TCPServerSocket.cc
+++ b/MAC/GCF/TM/src/PortImpl/GTM_TCPServerSocket.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/PortImpl/GTM_TCPServerSocket.h b/MAC/GCF/TM/src/PortImpl/GTM_TCPServerSocket.h
index a0e053934e4..cbf90c5d92d 100644
--- a/MAC/GCF/TM/src/PortImpl/GTM_TCPServerSocket.h
+++ b/MAC/GCF/TM/src/PortImpl/GTM_TCPServerSocket.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/PortImpl/GTM_TCPSocket.cc b/MAC/GCF/TM/src/PortImpl/GTM_TCPSocket.cc
index 11bac0c6c43..517a18000c6 100644
--- a/MAC/GCF/TM/src/PortImpl/GTM_TCPSocket.cc
+++ b/MAC/GCF/TM/src/PortImpl/GTM_TCPSocket.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/PortImpl/GTM_TCPSocket.h b/MAC/GCF/TM/src/PortImpl/GTM_TCPSocket.h
index 7980bbc256f..bc402a574cb 100644
--- a/MAC/GCF/TM/src/PortImpl/GTM_TCPSocket.h
+++ b/MAC/GCF/TM/src/PortImpl/GTM_TCPSocket.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/ServiceBroker/GTM_SBTCPPort.cc b/MAC/GCF/TM/src/ServiceBroker/GTM_SBTCPPort.cc
index 04466c4e7dc..3cf2541301d 100644
--- a/MAC/GCF/TM/src/ServiceBroker/GTM_SBTCPPort.cc
+++ b/MAC/GCF/TM/src/ServiceBroker/GTM_SBTCPPort.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/ServiceBroker/GTM_SBTCPPort.h b/MAC/GCF/TM/src/ServiceBroker/GTM_SBTCPPort.h
index 6c638f172dc..a09dd37f108 100644
--- a/MAC/GCF/TM/src/ServiceBroker/GTM_SBTCPPort.h
+++ b/MAC/GCF/TM/src/ServiceBroker/GTM_SBTCPPort.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/ServiceBroker/ServiceBrokerTask.cc b/MAC/GCF/TM/src/ServiceBroker/ServiceBrokerTask.cc
index 8efb555fbbb..6e99bc2a682 100644
--- a/MAC/GCF/TM/src/ServiceBroker/ServiceBrokerTask.cc
+++ b/MAC/GCF/TM/src/ServiceBroker/ServiceBrokerTask.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/ServiceBroker/ServiceBrokerTask.h b/MAC/GCF/TM/src/ServiceBroker/ServiceBrokerTask.h
index 7d0c497721e..b3dd3491487 100644
--- a/MAC/GCF/TM/src/ServiceBroker/ServiceBrokerTask.h
+++ b/MAC/GCF/TM/src/ServiceBroker/ServiceBrokerTask.h
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/TestFramework/TestFW_Protocol.prot b/MAC/GCF/TM/src/TestFramework/TestFW_Protocol.prot
index 0518b7958b8..607fe243c60 100644
--- a/MAC/GCF/TM/src/TestFramework/TestFW_Protocol.prot
+++ b/MAC/GCF/TM/src/TestFramework/TestFW_Protocol.prot
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2011
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/TestFramework/TestTask.cc b/MAC/GCF/TM/src/TestFramework/TestTask.cc
index abf2586a7fb..1b2c467aec6 100644
--- a/MAC/GCF/TM/src/TestFramework/TestTask.cc
+++ b/MAC/GCF/TM/src/TestFramework/TestTask.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2011
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/Timer/GTM_Timer.cc b/MAC/GCF/TM/src/Timer/GTM_Timer.cc
index b4c26db5cc5..5064d0ea495 100644
--- a/MAC/GCF/TM/src/Timer/GTM_Timer.cc
+++ b/MAC/GCF/TM/src/Timer/GTM_Timer.cc
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/Timer/GTM_Timer.h b/MAC/GCF/TM/src/Timer/GTM_Timer.h
index b4582c7d850..4695df826f4 100644
--- a/MAC/GCF/TM/src/Timer/GTM_Timer.h
+++ b/MAC/GCF/TM/src/Timer/GTM_Timer.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/Timer/GTM_TimerHandler.cc b/MAC/GCF/TM/src/Timer/GTM_TimerHandler.cc
index ebe46775238..2f5e287b9e7 100644
--- a/MAC/GCF/TM/src/Timer/GTM_TimerHandler.cc
+++ b/MAC/GCF/TM/src/Timer/GTM_TimerHandler.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/src/Timer/GTM_TimerHandler.h b/MAC/GCF/TM/src/Timer/GTM_TimerHandler.h
index ac351b30f49..37aa90ab5de 100644
--- a/MAC/GCF/TM/src/Timer/GTM_TimerHandler.h
+++ b/MAC/GCF/TM/src/Timer/GTM_TimerHandler.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/Echo.cc b/MAC/GCF/TM/test/Echo.cc
index 3911e0c9a6b..98680a67285 100644
--- a/MAC/GCF/TM/test/Echo.cc
+++ b/MAC/GCF/TM/test/Echo.cc
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/Echo.h b/MAC/GCF/TM/test/Echo.h
index 28720502100..45e988bef16 100644
--- a/MAC/GCF/TM/test/Echo.h
+++ b/MAC/GCF/TM/test/Echo.h
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/Ping.cc b/MAC/GCF/TM/test/Ping.cc
index c0533fe7508..08e7e3f0b56 100644
--- a/MAC/GCF/TM/test/Ping.cc
+++ b/MAC/GCF/TM/test/Ping.cc
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/Ping.h b/MAC/GCF/TM/test/Ping.h
index 02feec29c11..d2f9ac02f02 100644
--- a/MAC/GCF/TM/test/Ping.h
+++ b/MAC/GCF/TM/test/Ping.h
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/PythonTest_Protocol.prot b/MAC/GCF/TM/test/PythonTest_Protocol.prot
index 69a44dcb995..e6461bbf29b 100644
--- a/MAC/GCF/TM/test/PythonTest_Protocol.prot
+++ b/MAC/GCF/TM/test/PythonTest_Protocol.prot
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/tAutoOpen.cc b/MAC/GCF/TM/test/tAutoOpen.cc
index 1c9348e3cc3..b50df9898bd 100644
--- a/MAC/GCF/TM/test/tAutoOpen.cc
+++ b/MAC/GCF/TM/test/tAutoOpen.cc
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2009
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/tAutoOpen.h b/MAC/GCF/TM/test/tAutoOpen.h
index fc6308d5230..5366620b7a7 100644
--- a/MAC/GCF/TM/test/tAutoOpen.h
+++ b/MAC/GCF/TM/test/tAutoOpen.h
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2006
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/tClient.cc b/MAC/GCF/TM/test/tClient.cc
index a8563f5b7c6..671a51135bf 100644
--- a/MAC/GCF/TM/test/tClient.cc
+++ b/MAC/GCF/TM/test/tClient.cc
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2006
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/tClient.h b/MAC/GCF/TM/test/tClient.h
index a0bde272b1e..824f66ca80c 100644
--- a/MAC/GCF/TM/test/tClient.h
+++ b/MAC/GCF/TM/test/tClient.h
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2006
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/tEventBinding.cc b/MAC/GCF/TM/test/tEventBinding.cc
index 90de09b21c6..692ebdfbbf9 100644
--- a/MAC/GCF/TM/test/tEventBinding.cc
+++ b/MAC/GCF/TM/test/tEventBinding.cc
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2013
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/tEventBinding.h b/MAC/GCF/TM/test/tEventBinding.h
index e86a3d46321..b6d5b40f535 100644
--- a/MAC/GCF/TM/test/tEventBinding.h
+++ b/MAC/GCF/TM/test/tEventBinding.h
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2006
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/tEventQueue.cc b/MAC/GCF/TM/test/tEventQueue.cc
index 9bd31941ac4..7117401142e 100644
--- a/MAC/GCF/TM/test/tEventQueue.cc
+++ b/MAC/GCF/TM/test/tEventQueue.cc
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2006
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/tEventQueue.h b/MAC/GCF/TM/test/tEventQueue.h
index 64614e9c1f9..876687bfc64 100644
--- a/MAC/GCF/TM/test/tEventQueue.h
+++ b/MAC/GCF/TM/test/tEventQueue.h
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2006
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/tGCFPort.cc b/MAC/GCF/TM/test/tGCFPort.cc
index a8d3a7c3392..b2ac93b6d15 100644
--- a/MAC/GCF/TM/test/tGCFPort.cc
+++ b/MAC/GCF/TM/test/tGCFPort.cc
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2006
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/tGCFPort.h b/MAC/GCF/TM/test/tGCFPort.h
index 3a434d19fe6..74cfedf6302 100644
--- a/MAC/GCF/TM/test/tGCFPort.h
+++ b/MAC/GCF/TM/test/tGCFPort.h
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2006
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/tGCFTask1.cc b/MAC/GCF/TM/test/tGCFTask1.cc
index 61e008162b8..fe7edb81199 100644
--- a/MAC/GCF/TM/test/tGCFTask1.cc
+++ b/MAC/GCF/TM/test/tGCFTask1.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/tGCFTask2.cc b/MAC/GCF/TM/test/tGCFTask2.cc
index 756fe88bc40..4064180033e 100644
--- a/MAC/GCF/TM/test/tGCFTask2.cc
+++ b/MAC/GCF/TM/test/tGCFTask2.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/tGCFTask3.cc b/MAC/GCF/TM/test/tGCFTask3.cc
index b78d6d16b88..e01b4cc27f3 100644
--- a/MAC/GCF/TM/test/tGCFTask3.cc
+++ b/MAC/GCF/TM/test/tGCFTask3.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/tGCFTask4.cc b/MAC/GCF/TM/test/tGCFTask4.cc
index 957957c6833..4a698464b3e 100644
--- a/MAC/GCF/TM/test/tGCFTask4.cc
+++ b/MAC/GCF/TM/test/tGCFTask4.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/tGCFTask5.cc b/MAC/GCF/TM/test/tGCFTask5.cc
index fa685997146..a4aa8694db3 100644
--- a/MAC/GCF/TM/test/tGCFTask5.cc
+++ b/MAC/GCF/TM/test/tGCFTask5.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/tITCPort.cc b/MAC/GCF/TM/test/tITCPort.cc
index f16c67398ae..d49ad07f9fc 100644
--- a/MAC/GCF/TM/test/tITCPort.cc
+++ b/MAC/GCF/TM/test/tITCPort.cc
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2009
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/tITCPort.h b/MAC/GCF/TM/test/tITCPort.h
index 92f3ae10bda..24709b385e7 100644
--- a/MAC/GCF/TM/test/tITCPort.h
+++ b/MAC/GCF/TM/test/tITCPort.h
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2009
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/tPythonClient.cc b/MAC/GCF/TM/test/tPythonClient.cc
index eaedaf00b92..4c9feeeda68 100644
--- a/MAC/GCF/TM/test/tPythonClient.cc
+++ b/MAC/GCF/TM/test/tPythonClient.cc
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2006
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/tPythonClient.h b/MAC/GCF/TM/test/tPythonClient.h
index abe29be4258..dc864f61b2c 100644
--- a/MAC/GCF/TM/test/tPythonClient.h
+++ b/MAC/GCF/TM/test/tPythonClient.h
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2006
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/tPythonServer.cc b/MAC/GCF/TM/test/tPythonServer.cc
index a3062dc4c1e..6a00d106697 100644
--- a/MAC/GCF/TM/test/tPythonServer.cc
+++ b/MAC/GCF/TM/test/tPythonServer.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/tPythonServer.h b/MAC/GCF/TM/test/tPythonServer.h
index 3d72ee09b47..7ac017890c2 100644
--- a/MAC/GCF/TM/test/tPythonServer.h
+++ b/MAC/GCF/TM/test/tPythonServer.h
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2009
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/tServer.cc b/MAC/GCF/TM/test/tServer.cc
index 0c73dccedbb..ed8b86dc3e6 100644
--- a/MAC/GCF/TM/test/tServer.cc
+++ b/MAC/GCF/TM/test/tServer.cc
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2009
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/tServer.h b/MAC/GCF/TM/test/tServer.h
index 8df307a4228..6a3f3eead75 100644
--- a/MAC/GCF/TM/test/tServer.h
+++ b/MAC/GCF/TM/test/tServer.h
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2009
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/tStateResult.cc b/MAC/GCF/TM/test/tStateResult.cc
index 9eb4d036da0..b68904ed0b2 100644
--- a/MAC/GCF/TM/test/tStateResult.cc
+++ b/MAC/GCF/TM/test/tStateResult.cc
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2009
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/tStateResult.h b/MAC/GCF/TM/test/tStateResult.h
index 82062f7586c..5205a0add35 100644
--- a/MAC/GCF/TM/test/tStateResult.h
+++ b/MAC/GCF/TM/test/tStateResult.h
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2006
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/tTimer.cc b/MAC/GCF/TM/test/tTimer.cc
index aef32b12ee2..88803298452 100644
--- a/MAC/GCF/TM/test/tTimer.cc
+++ b/MAC/GCF/TM/test/tTimer.cc
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2006
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/tTimer.h b/MAC/GCF/TM/test/tTimer.h
index 5a30a9a78e1..76df436eecc 100644
--- a/MAC/GCF/TM/test/tTimer.h
+++ b/MAC/GCF/TM/test/tTimer.h
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2006
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/testTask.cc b/MAC/GCF/TM/test/testTask.cc
index 654dcd5a4ab..3f406845780 100644
--- a/MAC/GCF/TM/test/testTask.cc
+++ b/MAC/GCF/TM/test/testTask.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/TM/test/testTask.h b/MAC/GCF/TM/test/testTask.h
index e96f56781b2..4d573a98bdd 100644
--- a/MAC/GCF/TM/test/testTask.h
+++ b/MAC/GCF/TM/test/testTask.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PA/pvss/scripts/libs/gcf-logging.ctl b/MAC/GCF/_PAL/PA/pvss/scripts/libs/gcf-logging.ctl
index 305ffc078ce..ab33d07e4dc 100644
--- a/MAC/GCF/_PAL/PA/pvss/scripts/libs/gcf-logging.ctl
+++ b/MAC/GCF/_PAL/PA/pvss/scripts/libs/gcf-logging.ctl
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PA/pvss/scripts/libs/gcfpa-com.ctl b/MAC/GCF/_PAL/PA/pvss/scripts/libs/gcfpa-com.ctl
index d882f1e91ff..256979483f4 100644
--- a/MAC/GCF/_PAL/PA/pvss/scripts/libs/gcfpa-com.ctl
+++ b/MAC/GCF/_PAL/PA/pvss/scripts/libs/gcfpa-com.ctl
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PA/pvss/scripts/libs/gcfpa-cwd.ctl b/MAC/GCF/_PAL/PA/pvss/scripts/libs/gcfpa-cwd.ctl
index 34d1a585b96..c3a513e4ac6 100644
--- a/MAC/GCF/_PAL/PA/pvss/scripts/libs/gcfpa-cwd.ctl
+++ b/MAC/GCF/_PAL/PA/pvss/scripts/libs/gcfpa-cwd.ctl
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PA/pvss/scripts/libs/gcfpa-pml.ctl b/MAC/GCF/_PAL/PA/pvss/scripts/libs/gcfpa-pml.ctl
index 7dd9aaadea5..ace00617577 100644
--- a/MAC/GCF/_PAL/PA/pvss/scripts/libs/gcfpa-pml.ctl
+++ b/MAC/GCF/_PAL/PA/pvss/scripts/libs/gcfpa-pml.ctl
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PA/src/GPA_Controller.cc b/MAC/GCF/_PAL/PA/src/GPA_Controller.cc
index f4c0ea0808f..623ee8af29e 100644
--- a/MAC/GCF/_PAL/PA/src/GPA_Controller.cc
+++ b/MAC/GCF/_PAL/PA/src/GPA_Controller.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PA/src/GPA_Controller.h b/MAC/GCF/_PAL/PA/src/GPA_Controller.h
index 36e0733e496..38ef5d5a705 100644
--- a/MAC/GCF/_PAL/PA/src/GPA_Controller.h
+++ b/MAC/GCF/_PAL/PA/src/GPA_Controller.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PA/src/GPA_Defines.h b/MAC/GCF/_PAL/PA/src/GPA_Defines.h
index 35f474c2944..f454b7dfba7 100644
--- a/MAC/GCF/_PAL/PA/src/GPA_Defines.h
+++ b/MAC/GCF/_PAL/PA/src/GPA_Defines.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PA/src/GPA_Main.cc b/MAC/GCF/_PAL/PA/src/GPA_Main.cc
index 040770b61b2..9f10dc34eff 100644
--- a/MAC/GCF/_PAL/PA/src/GPA_Main.cc
+++ b/MAC/GCF/_PAL/PA/src/GPA_Main.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PA/src/GPA_PropSetSession.cc b/MAC/GCF/_PAL/PA/src/GPA_PropSetSession.cc
index 3c8660a18f6..1402815d5b9 100644
--- a/MAC/GCF/_PAL/PA/src/GPA_PropSetSession.cc
+++ b/MAC/GCF/_PAL/PA/src/GPA_PropSetSession.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PA/src/GPA_PropSetSession.h b/MAC/GCF/_PAL/PA/src/GPA_PropSetSession.h
index e6b41ab0ada..3ce35dbf4cf 100644
--- a/MAC/GCF/_PAL/PA/src/GPA_PropSetSession.h
+++ b/MAC/GCF/_PAL/PA/src/GPA_PropSetSession.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PA/src/GPA_PropertySet.cc b/MAC/GCF/_PAL/PA/src/GPA_PropertySet.cc
index d3a5612a238..fc376bd1c8f 100644
--- a/MAC/GCF/_PAL/PA/src/GPA_PropertySet.cc
+++ b/MAC/GCF/_PAL/PA/src/GPA_PropertySet.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PA/src/GPA_PropertySet.h b/MAC/GCF/_PAL/PA/src/GPA_PropertySet.h
index 061602ec1fb..1f4b193e995 100644
--- a/MAC/GCF/_PAL/PA/src/GPA_PropertySet.h
+++ b/MAC/GCF/_PAL/PA/src/GPA_PropertySet.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PA/src/GPA_RequestManager.cc b/MAC/GCF/_PAL/PA/src/GPA_RequestManager.cc
index a020af7deaa..2b49ae563c6 100644
--- a/MAC/GCF/_PAL/PA/src/GPA_RequestManager.cc
+++ b/MAC/GCF/_PAL/PA/src/GPA_RequestManager.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PA/src/GPA_RequestManager.h b/MAC/GCF/_PAL/PA/src/GPA_RequestManager.h
index bc3e45aac0e..368df633726 100644
--- a/MAC/GCF/_PAL/PA/src/GPA_RequestManager.h
+++ b/MAC/GCF/_PAL/PA/src/GPA_RequestManager.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PI/src/GPI_CEPServer.cc b/MAC/GCF/_PAL/PI/src/GPI_CEPServer.cc
index 12877e9e29b..cc784c74ed5 100644
--- a/MAC/GCF/_PAL/PI/src/GPI_CEPServer.cc
+++ b/MAC/GCF/_PAL/PI/src/GPI_CEPServer.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PI/src/GPI_CEPServer.h b/MAC/GCF/_PAL/PI/src/GPI_CEPServer.h
index eb4b32e28fa..6d3805ee33e 100644
--- a/MAC/GCF/_PAL/PI/src/GPI_CEPServer.h
+++ b/MAC/GCF/_PAL/PI/src/GPI_CEPServer.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PI/src/GPI_Controller.cc b/MAC/GCF/_PAL/PI/src/GPI_Controller.cc
index ffe0c6c5c37..9d761cdaa85 100644
--- a/MAC/GCF/_PAL/PI/src/GPI_Controller.cc
+++ b/MAC/GCF/_PAL/PI/src/GPI_Controller.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PI/src/GPI_Controller.h b/MAC/GCF/_PAL/PI/src/GPI_Controller.h
index 0e87e92b549..bd34065eadc 100644
--- a/MAC/GCF/_PAL/PI/src/GPI_Controller.h
+++ b/MAC/GCF/_PAL/PI/src/GPI_Controller.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PI/src/GPI_Defines.h b/MAC/GCF/_PAL/PI/src/GPI_Defines.h
index 704d608284c..0819247bdab 100644
--- a/MAC/GCF/_PAL/PI/src/GPI_Defines.h
+++ b/MAC/GCF/_PAL/PI/src/GPI_Defines.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PI/src/GPI_Main.cc b/MAC/GCF/_PAL/PI/src/GPI_Main.cc
index c76d31d0770..6ab46fe8200 100644
--- a/MAC/GCF/_PAL/PI/src/GPI_Main.cc
+++ b/MAC/GCF/_PAL/PI/src/GPI_Main.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PI/src/GPI_PMLlightServer.cc b/MAC/GCF/_PAL/PI/src/GPI_PMLlightServer.cc
index 348ccdfd156..7294cec6a59 100644
--- a/MAC/GCF/_PAL/PI/src/GPI_PMLlightServer.cc
+++ b/MAC/GCF/_PAL/PI/src/GPI_PMLlightServer.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PI/src/GPI_PMLlightServer.h b/MAC/GCF/_PAL/PI/src/GPI_PMLlightServer.h
index 71ada5f77dc..10d03c27335 100644
--- a/MAC/GCF/_PAL/PI/src/GPI_PMLlightServer.h
+++ b/MAC/GCF/_PAL/PI/src/GPI_PMLlightServer.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PI/src/GPI_PropertyProxy.cc b/MAC/GCF/_PAL/PI/src/GPI_PropertyProxy.cc
index c8d33c15076..693f09887da 100644
--- a/MAC/GCF/_PAL/PI/src/GPI_PropertyProxy.cc
+++ b/MAC/GCF/_PAL/PI/src/GPI_PropertyProxy.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PI/src/GPI_PropertyProxy.h b/MAC/GCF/_PAL/PI/src/GPI_PropertyProxy.h
index 0edb84a1553..a6887bb94a8 100644
--- a/MAC/GCF/_PAL/PI/src/GPI_PropertyProxy.h
+++ b/MAC/GCF/_PAL/PI/src/GPI_PropertyProxy.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PI/src/GPI_PropertySet.cc b/MAC/GCF/_PAL/PI/src/GPI_PropertySet.cc
index 2d9a55e1749..7412a8c6334 100644
--- a/MAC/GCF/_PAL/PI/src/GPI_PropertySet.cc
+++ b/MAC/GCF/_PAL/PI/src/GPI_PropertySet.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PI/src/GPI_PropertySet.h b/MAC/GCF/_PAL/PI/src/GPI_PropertySet.h
index 0fe6abf0ea9..4cde456f259 100644
--- a/MAC/GCF/_PAL/PI/src/GPI_PropertySet.h
+++ b/MAC/GCF/_PAL/PI/src/GPI_PropertySet.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PI/src/GPI_RTCServer.cc b/MAC/GCF/_PAL/PI/src/GPI_RTCServer.cc
index 996c82d917c..bb2b8dff679 100644
--- a/MAC/GCF/_PAL/PI/src/GPI_RTCServer.cc
+++ b/MAC/GCF/_PAL/PI/src/GPI_RTCServer.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PI/src/GPI_RTCServer.h b/MAC/GCF/_PAL/PI/src/GPI_RTCServer.h
index cf0583a0bba..56a5b8bd4bd 100644
--- a/MAC/GCF/_PAL/PI/src/GPI_RTCServer.h
+++ b/MAC/GCF/_PAL/PI/src/GPI_RTCServer.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PI/src/GPI_TH_Port.cc b/MAC/GCF/_PAL/PI/src/GPI_TH_Port.cc
index c2630fd1c34..8a6d4f49752 100644
--- a/MAC/GCF/_PAL/PI/src/GPI_TH_Port.cc
+++ b/MAC/GCF/_PAL/PI/src/GPI_TH_Port.cc
@@ -2,7 +2,7 @@
 //
 //  Copyright (C) 2000-2004
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PI/src/GPI_TH_Port.h b/MAC/GCF/_PAL/PI/src/GPI_TH_Port.h
index a26aff04389..3aa13d74ec5 100644
--- a/MAC/GCF/_PAL/PI/src/GPI_TH_Port.h
+++ b/MAC/GCF/_PAL/PI/src/GPI_TH_Port.h
@@ -3,7 +3,7 @@
 //#
 //# Copyright (C) 2000, 2001
 //# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //# This program is free software; you can redistribute it and/or modify
 //# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PML/src/GCF_Answer.cc b/MAC/GCF/_PAL/PML/src/GCF_Answer.cc
index bbe181f16d1..c726b798d7a 100644
--- a/MAC/GCF/_PAL/PML/src/GCF_Answer.cc
+++ b/MAC/GCF/_PAL/PML/src/GCF_Answer.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PML/src/GCF_ExtProperty.cc b/MAC/GCF/_PAL/PML/src/GCF_ExtProperty.cc
index 7bd8cb2bc5a..362465220c8 100644
--- a/MAC/GCF/_PAL/PML/src/GCF_ExtProperty.cc
+++ b/MAC/GCF/_PAL/PML/src/GCF_ExtProperty.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PML/src/GCF_ExtPropertySet.cc b/MAC/GCF/_PAL/PML/src/GCF_ExtPropertySet.cc
index c9a91f68a3a..1d80cf86bf6 100644
--- a/MAC/GCF/_PAL/PML/src/GCF_ExtPropertySet.cc
+++ b/MAC/GCF/_PAL/PML/src/GCF_ExtPropertySet.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PML/src/GCF_MyProperty.cc b/MAC/GCF/_PAL/PML/src/GCF_MyProperty.cc
index e53638373d4..eda7813f5d8 100644
--- a/MAC/GCF/_PAL/PML/src/GCF_MyProperty.cc
+++ b/MAC/GCF/_PAL/PML/src/GCF_MyProperty.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PML/src/GCF_MyPropertySet.cc b/MAC/GCF/_PAL/PML/src/GCF_MyPropertySet.cc
index 71a1fa53f86..68aa264375c 100644
--- a/MAC/GCF/_PAL/PML/src/GCF_MyPropertySet.cc
+++ b/MAC/GCF/_PAL/PML/src/GCF_MyPropertySet.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PML/src/GCF_Property.cc b/MAC/GCF/_PAL/PML/src/GCF_Property.cc
index c9b95b9c724..248d0fcda62 100644
--- a/MAC/GCF/_PAL/PML/src/GCF_Property.cc
+++ b/MAC/GCF/_PAL/PML/src/GCF_Property.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PML/src/GCF_PropertyProxy.cc b/MAC/GCF/_PAL/PML/src/GCF_PropertyProxy.cc
index 378a2978709..d8be111e420 100644
--- a/MAC/GCF/_PAL/PML/src/GCF_PropertyProxy.cc
+++ b/MAC/GCF/_PAL/PML/src/GCF_PropertyProxy.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PML/src/GCF_PropertySet.cc b/MAC/GCF/_PAL/PML/src/GCF_PropertySet.cc
index 09bf345b069..581fa265567 100644
--- a/MAC/GCF/_PAL/PML/src/GCF_PropertySet.cc
+++ b/MAC/GCF/_PAL/PML/src/GCF_PropertySet.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PML/src/GCF_PropertySetAnswer.cc b/MAC/GCF/_PAL/PML/src/GCF_PropertySetAnswer.cc
index 984acb8eef8..26b1c6682b3 100644
--- a/MAC/GCF/_PAL/PML/src/GCF_PropertySetAnswer.cc
+++ b/MAC/GCF/_PAL/PML/src/GCF_PropertySetAnswer.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PML/src/GPM_Controller.cc b/MAC/GCF/_PAL/PML/src/GPM_Controller.cc
index d40ee4bf2d3..b3c43cac3c8 100644
--- a/MAC/GCF/_PAL/PML/src/GPM_Controller.cc
+++ b/MAC/GCF/_PAL/PML/src/GPM_Controller.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PML/src/GPM_Controller.h b/MAC/GCF/_PAL/PML/src/GPM_Controller.h
index 3a1c42154c5..895194089f5 100644
--- a/MAC/GCF/_PAL/PML/src/GPM_Controller.h
+++ b/MAC/GCF/_PAL/PML/src/GPM_Controller.h
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PML/src/GPM_Defines.h b/MAC/GCF/_PAL/PML/src/GPM_Defines.h
index 96654957347..62e77195fb4 100644
--- a/MAC/GCF/_PAL/PML/src/GPM_Defines.h
+++ b/MAC/GCF/_PAL/PML/src/GPM_Defines.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PML/src/GPM_PropertyProxy.h b/MAC/GCF/_PAL/PML/src/GPM_PropertyProxy.h
index 269c25b03d3..0122207b7bc 100644
--- a/MAC/GCF/_PAL/PML/src/GPM_PropertyProxy.h
+++ b/MAC/GCF/_PAL/PML/src/GPM_PropertyProxy.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PML/src/GPM_PropertyService.cc b/MAC/GCF/_PAL/PML/src/GPM_PropertyService.cc
index aae03761212..7ce01858192 100644
--- a/MAC/GCF/_PAL/PML/src/GPM_PropertyService.cc
+++ b/MAC/GCF/_PAL/PML/src/GPM_PropertyService.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PML/src/GPM_PropertyService.h b/MAC/GCF/_PAL/PML/src/GPM_PropertyService.h
index 09e566257c9..7a328c41d52 100644
--- a/MAC/GCF/_PAL/PML/src/GPM_PropertyService.h
+++ b/MAC/GCF/_PAL/PML/src/GPM_PropertyService.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PML/test/GSA_Defines.h b/MAC/GCF/_PAL/PML/test/GSA_Defines.h
index bf4d73ec3ce..8a32384ca5c 100644
--- a/MAC/GCF/_PAL/PML/test/GSA_Defines.h
+++ b/MAC/GCF/_PAL/PML/test/GSA_Defines.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PML/test/GSA_Service.h b/MAC/GCF/_PAL/PML/test/GSA_Service.h
index 2d1e205cc56..e7b9edf3cdd 100644
--- a/MAC/GCF/_PAL/PML/test/GSA_Service.h
+++ b/MAC/GCF/_PAL/PML/test/GSA_Service.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PML/test/PerformanceService.h b/MAC/GCF/_PAL/PML/test/PerformanceService.h
index 029c6a7521a..c4e85e6b23d 100644
--- a/MAC/GCF/_PAL/PML/test/PerformanceService.h
+++ b/MAC/GCF/_PAL/PML/test/PerformanceService.h
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PML/test/tPAPerformance.cc b/MAC/GCF/_PAL/PML/test/tPAPerformance.cc
index 1008b17fd69..888afd333eb 100644
--- a/MAC/GCF/_PAL/PML/test/tPAPerformance.cc
+++ b/MAC/GCF/_PAL/PML/test/tPAPerformance.cc
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2007
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/PML/test/tPAPerformance.h b/MAC/GCF/_PAL/PML/test/tPAPerformance.h
index 9f442d89d46..09540afbc0e 100644
--- a/MAC/GCF/_PAL/PML/test/tPAPerformance.h
+++ b/MAC/GCF/_PAL/PML/test/tPAPerformance.h
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2007
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/SAL/src/GCF_PVSSInfo.cc b/MAC/GCF/_PAL/SAL/src/GCF_PVSSInfo.cc
index 9bdbe47a518..690d64c1c74 100644
--- a/MAC/GCF/_PAL/SAL/src/GCF_PVSSInfo.cc
+++ b/MAC/GCF/_PAL/SAL/src/GCF_PVSSInfo.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/SAL/src/GCF_PVSSPort.cc b/MAC/GCF/_PAL/SAL/src/GCF_PVSSPort.cc
index 6e77b9d8f03..e23c8c56d07 100644
--- a/MAC/GCF/_PAL/SAL/src/GCF_PVSSPort.cc
+++ b/MAC/GCF/_PAL/SAL/src/GCF_PVSSPort.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/SAL/src/GCF_SysConnGuard.cc b/MAC/GCF/_PAL/SAL/src/GCF_SysConnGuard.cc
index bed05b2853f..4e49301fa05 100644
--- a/MAC/GCF/_PAL/SAL/src/GCF_SysConnGuard.cc
+++ b/MAC/GCF/_PAL/SAL/src/GCF_SysConnGuard.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/SAL/src/GSA_Defines.h b/MAC/GCF/_PAL/SAL/src/GSA_Defines.h
index bf4d73ec3ce..8a32384ca5c 100644
--- a/MAC/GCF/_PAL/SAL/src/GSA_Defines.h
+++ b/MAC/GCF/_PAL/SAL/src/GSA_Defines.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/SAL/src/GSA_PortService.cc b/MAC/GCF/_PAL/SAL/src/GSA_PortService.cc
index 84c6a3d8a11..d5a6380b9cd 100644
--- a/MAC/GCF/_PAL/SAL/src/GSA_PortService.cc
+++ b/MAC/GCF/_PAL/SAL/src/GSA_PortService.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/SAL/src/GSA_PortService.h b/MAC/GCF/_PAL/SAL/src/GSA_PortService.h
index 6d9e2a52614..7bfa0af03d1 100644
--- a/MAC/GCF/_PAL/SAL/src/GSA_PortService.h
+++ b/MAC/GCF/_PAL/SAL/src/GSA_PortService.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/SAL/src/GSA_PvssApi.cc b/MAC/GCF/_PAL/SAL/src/GSA_PvssApi.cc
index 24036907d5f..a9acde31fb0 100644
--- a/MAC/GCF/_PAL/SAL/src/GSA_PvssApi.cc
+++ b/MAC/GCF/_PAL/SAL/src/GSA_PvssApi.cc
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/SAL/src/GSA_PvssApi.h b/MAC/GCF/_PAL/SAL/src/GSA_PvssApi.h
index 3f590e2af5f..1cd9c60c91e 100644
--- a/MAC/GCF/_PAL/SAL/src/GSA_PvssApi.h
+++ b/MAC/GCF/_PAL/SAL/src/GSA_PvssApi.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/SAL/src/GSA_Resources.cc b/MAC/GCF/_PAL/SAL/src/GSA_Resources.cc
index 6a588f69737..87e76cabb6b 100644
--- a/MAC/GCF/_PAL/SAL/src/GSA_Resources.cc
+++ b/MAC/GCF/_PAL/SAL/src/GSA_Resources.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/SAL/src/GSA_Resources.h b/MAC/GCF/_PAL/SAL/src/GSA_Resources.h
index 351f3776d45..281c2e6fd9c 100644
--- a/MAC/GCF/_PAL/SAL/src/GSA_Resources.h
+++ b/MAC/GCF/_PAL/SAL/src/GSA_Resources.h
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/SAL/src/GSA_SCADAHandler.cc b/MAC/GCF/_PAL/SAL/src/GSA_SCADAHandler.cc
index a714af0d137..792aa16f53b 100644
--- a/MAC/GCF/_PAL/SAL/src/GSA_SCADAHandler.cc
+++ b/MAC/GCF/_PAL/SAL/src/GSA_SCADAHandler.cc
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/SAL/src/GSA_SCADAHandler.h b/MAC/GCF/_PAL/SAL/src/GSA_SCADAHandler.h
index d737f385a40..82a0d44b715 100644
--- a/MAC/GCF/_PAL/SAL/src/GSA_SCADAHandler.h
+++ b/MAC/GCF/_PAL/SAL/src/GSA_SCADAHandler.h
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/SAL/src/GSA_Service.cc b/MAC/GCF/_PAL/SAL/src/GSA_Service.cc
index a46fd1358ac..f7e65167a33 100644
--- a/MAC/GCF/_PAL/SAL/src/GSA_Service.cc
+++ b/MAC/GCF/_PAL/SAL/src/GSA_Service.cc
@@ -2,7 +2,7 @@
 //#
 //# Copyright (C) 2002-2003
 //# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //# This program is free software; you can redistribute it and/or modify
 //# it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/SAL/src/GSA_Service.h b/MAC/GCF/_PAL/SAL/src/GSA_Service.h
index 2d1e205cc56..e7b9edf3cdd 100644
--- a/MAC/GCF/_PAL/SAL/src/GSA_Service.h
+++ b/MAC/GCF/_PAL/SAL/src/GSA_Service.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/SAL/src/GSA_SysConnGuard.cc b/MAC/GCF/_PAL/SAL/src/GSA_SysConnGuard.cc
index 31100d30e54..5bfabcbaefb 100644
--- a/MAC/GCF/_PAL/SAL/src/GSA_SysConnGuard.cc
+++ b/MAC/GCF/_PAL/SAL/src/GSA_SysConnGuard.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/SAL/src/GSA_SysConnGuard.h b/MAC/GCF/_PAL/SAL/src/GSA_SysConnGuard.h
index 59e28e3780f..4aa6fbbff38 100644
--- a/MAC/GCF/_PAL/SAL/src/GSA_SysConnGuard.h
+++ b/MAC/GCF/_PAL/SAL/src/GSA_SysConnGuard.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/SAL/src/GSA_WaitForAnswer.cc b/MAC/GCF/_PAL/SAL/src/GSA_WaitForAnswer.cc
index 5f70eaa6d9a..0fc4eb3bef3 100644
--- a/MAC/GCF/_PAL/SAL/src/GSA_WaitForAnswer.cc
+++ b/MAC/GCF/_PAL/SAL/src/GSA_WaitForAnswer.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/SAL/src/GSA_WaitForAnswer.h b/MAC/GCF/_PAL/SAL/src/GSA_WaitForAnswer.h
index 849a6910c9e..54645e8cb6e 100644
--- a/MAC/GCF/_PAL/SAL/src/GSA_WaitForAnswer.h
+++ b/MAC/GCF/_PAL/SAL/src/GSA_WaitForAnswer.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/SAL/test/Echo.cc b/MAC/GCF/_PAL/SAL/test/Echo.cc
index bf4a940ede2..67a765471be 100644
--- a/MAC/GCF/_PAL/SAL/test/Echo.cc
+++ b/MAC/GCF/_PAL/SAL/test/Echo.cc
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/SAL/test/Echo.h b/MAC/GCF/_PAL/SAL/test/Echo.h
index 80bb99a6b2e..d9ebbfdd1d3 100644
--- a/MAC/GCF/_PAL/SAL/test/Echo.h
+++ b/MAC/GCF/_PAL/SAL/test/Echo.h
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/SAL/test/PerformanceService.h b/MAC/GCF/_PAL/SAL/test/PerformanceService.h
index fe37d3342c4..9df33633646 100644
--- a/MAC/GCF/_PAL/SAL/test/PerformanceService.h
+++ b/MAC/GCF/_PAL/SAL/test/PerformanceService.h
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/SAL/test/Ping.cc b/MAC/GCF/_PAL/SAL/test/Ping.cc
index 09a53348220..0091b62f22b 100644
--- a/MAC/GCF/_PAL/SAL/test/Ping.cc
+++ b/MAC/GCF/_PAL/SAL/test/Ping.cc
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/SAL/test/Ping.h b/MAC/GCF/_PAL/SAL/test/Ping.h
index 3295a828941..8921b580de0 100644
--- a/MAC/GCF/_PAL/SAL/test/Ping.h
+++ b/MAC/GCF/_PAL/SAL/test/Ping.h
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/SAL/test/Service.h b/MAC/GCF/_PAL/SAL/test/Service.h
index 0d381e22e07..8db90797e63 100644
--- a/MAC/GCF/_PAL/SAL/test/Service.h
+++ b/MAC/GCF/_PAL/SAL/test/Service.h
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/SAL/test/tGSAPerformance.cc b/MAC/GCF/_PAL/SAL/test/tGSAPerformance.cc
index 07c3a65db45..752a7774b4d 100644
--- a/MAC/GCF/_PAL/SAL/test/tGSAPerformance.cc
+++ b/MAC/GCF/_PAL/SAL/test/tGSAPerformance.cc
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2007
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/SAL/test/tGSAPerformance.h b/MAC/GCF/_PAL/SAL/test/tGSAPerformance.h
index c03a6636974..e4eeef8ff14 100644
--- a/MAC/GCF/_PAL/SAL/test/tGSAPerformance.h
+++ b/MAC/GCF/_PAL/SAL/test/tGSAPerformance.h
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/SAL/test/tGSAService.cc b/MAC/GCF/_PAL/SAL/test/tGSAService.cc
index 3af00736a84..c76c82ce8cf 100644
--- a/MAC/GCF/_PAL/SAL/test/tGSAService.cc
+++ b/MAC/GCF/_PAL/SAL/test/tGSAService.cc
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/SAL/test/tGSAService.h b/MAC/GCF/_PAL/SAL/test/tGSAService.h
index 620efdb44b3..a8c1b226b1b 100644
--- a/MAC/GCF/_PAL/SAL/test/tGSAService.h
+++ b/MAC/GCF/_PAL/SAL/test/tGSAService.h
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/include/GCF/PAL/GCF_Answer.h b/MAC/GCF/_PAL/include/GCF/PAL/GCF_Answer.h
index d74e73d6a35..920a434353d 100644
--- a/MAC/GCF/_PAL/include/GCF/PAL/GCF_Answer.h
+++ b/MAC/GCF/_PAL/include/GCF/PAL/GCF_Answer.h
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/include/GCF/PAL/GCF_ExtProperty.h b/MAC/GCF/_PAL/include/GCF/PAL/GCF_ExtProperty.h
index f25691fcfcf..2b220b174c2 100644
--- a/MAC/GCF/_PAL/include/GCF/PAL/GCF_ExtProperty.h
+++ b/MAC/GCF/_PAL/include/GCF/PAL/GCF_ExtProperty.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/include/GCF/PAL/GCF_ExtPropertySet.h b/MAC/GCF/_PAL/include/GCF/PAL/GCF_ExtPropertySet.h
index 3ed2b3f69fc..df4f3ad3b01 100644
--- a/MAC/GCF/_PAL/include/GCF/PAL/GCF_ExtPropertySet.h
+++ b/MAC/GCF/_PAL/include/GCF/PAL/GCF_ExtPropertySet.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/include/GCF/PAL/GCF_MyProperty.h b/MAC/GCF/_PAL/include/GCF/PAL/GCF_MyProperty.h
index 8f42d05f0a9..07278f55619 100644
--- a/MAC/GCF/_PAL/include/GCF/PAL/GCF_MyProperty.h
+++ b/MAC/GCF/_PAL/include/GCF/PAL/GCF_MyProperty.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/include/GCF/PAL/GCF_MyPropertySet.h b/MAC/GCF/_PAL/include/GCF/PAL/GCF_MyPropertySet.h
index 52e12bbe012..f36d035ee2f 100644
--- a/MAC/GCF/_PAL/include/GCF/PAL/GCF_MyPropertySet.h
+++ b/MAC/GCF/_PAL/include/GCF/PAL/GCF_MyPropertySet.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/include/GCF/PAL/GCF_PVSSInfo.h b/MAC/GCF/_PAL/include/GCF/PAL/GCF_PVSSInfo.h
index 2eac5a36a62..74effb0d343 100644
--- a/MAC/GCF/_PAL/include/GCF/PAL/GCF_PVSSInfo.h
+++ b/MAC/GCF/_PAL/include/GCF/PAL/GCF_PVSSInfo.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/include/GCF/PAL/GCF_PVSSPort.h b/MAC/GCF/_PAL/include/GCF/PAL/GCF_PVSSPort.h
index 1badcc5e160..bba53570edb 100644
--- a/MAC/GCF/_PAL/include/GCF/PAL/GCF_PVSSPort.h
+++ b/MAC/GCF/_PAL/include/GCF/PAL/GCF_PVSSPort.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/include/GCF/PAL/GCF_Property.h b/MAC/GCF/_PAL/include/GCF/PAL/GCF_Property.h
index 4725ff88901..dfae9b5ffa0 100644
--- a/MAC/GCF/_PAL/include/GCF/PAL/GCF_Property.h
+++ b/MAC/GCF/_PAL/include/GCF/PAL/GCF_Property.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/include/GCF/PAL/GCF_PropertyProxy.h b/MAC/GCF/_PAL/include/GCF/PAL/GCF_PropertyProxy.h
index e677e47c990..5e58c4fd2b0 100644
--- a/MAC/GCF/_PAL/include/GCF/PAL/GCF_PropertyProxy.h
+++ b/MAC/GCF/_PAL/include/GCF/PAL/GCF_PropertyProxy.h
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/include/GCF/PAL/GCF_PropertySet.h b/MAC/GCF/_PAL/include/GCF/PAL/GCF_PropertySet.h
index 406dc95599f..5f59473197a 100644
--- a/MAC/GCF/_PAL/include/GCF/PAL/GCF_PropertySet.h
+++ b/MAC/GCF/_PAL/include/GCF/PAL/GCF_PropertySet.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/include/GCF/PAL/GCF_PropertySetAnswer.h b/MAC/GCF/_PAL/include/GCF/PAL/GCF_PropertySetAnswer.h
index 519f642459b..3155ba70ffa 100644
--- a/MAC/GCF/_PAL/include/GCF/PAL/GCF_PropertySetAnswer.h
+++ b/MAC/GCF/_PAL/include/GCF/PAL/GCF_PropertySetAnswer.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/include/GCF/PAL/GCF_PropertySetAnswerHandlerInterface.h b/MAC/GCF/_PAL/include/GCF/PAL/GCF_PropertySetAnswerHandlerInterface.h
index 67ca101102c..a2a422ccb37 100644
--- a/MAC/GCF/_PAL/include/GCF/PAL/GCF_PropertySetAnswerHandlerInterface.h
+++ b/MAC/GCF/_PAL/include/GCF/PAL/GCF_PropertySetAnswerHandlerInterface.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PAL/include/GCF/PAL/GCF_SysConnGuard.h b/MAC/GCF/_PAL/include/GCF/PAL/GCF_SysConnGuard.h
index 5625bf31438..88640e47bb9 100644
--- a/MAC/GCF/_PAL/include/GCF/PAL/GCF_SysConnGuard.h
+++ b/MAC/GCF/_PAL/include/GCF/PAL/GCF_SysConnGuard.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PALlight/CEP-PMLlight/src/CEPProperty.cc b/MAC/GCF/_PALlight/CEP-PMLlight/src/CEPProperty.cc
index e3e02bcb508..e48566c03b9 100644
--- a/MAC/GCF/_PALlight/CEP-PMLlight/src/CEPProperty.cc
+++ b/MAC/GCF/_PALlight/CEP-PMLlight/src/CEPProperty.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PALlight/CEP-PMLlight/src/CEPPropertySet.cc b/MAC/GCF/_PALlight/CEP-PMLlight/src/CEPPropertySet.cc
index 627fe1ce5b2..7ab2473dde1 100644
--- a/MAC/GCF/_PALlight/CEP-PMLlight/src/CEPPropertySet.cc
+++ b/MAC/GCF/_PALlight/CEP-PMLlight/src/CEPPropertySet.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PALlight/CEP-PMLlight/src/PICEPDefines.h b/MAC/GCF/_PALlight/CEP-PMLlight/src/PICEPDefines.h
index d619244ddcf..dcdd5a286bd 100644
--- a/MAC/GCF/_PALlight/CEP-PMLlight/src/PICEPDefines.h
+++ b/MAC/GCF/_PALlight/CEP-PMLlight/src/PICEPDefines.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PALlight/CEP-PMLlight/src/PIClient.cc b/MAC/GCF/_PALlight/CEP-PMLlight/src/PIClient.cc
index 9cd37b75925..4416e9041dc 100644
--- a/MAC/GCF/_PALlight/CEP-PMLlight/src/PIClient.cc
+++ b/MAC/GCF/_PALlight/CEP-PMLlight/src/PIClient.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PALlight/CEP-PMLlight/src/PIClient.h b/MAC/GCF/_PALlight/CEP-PMLlight/src/PIClient.h
index 2271afa1784..c248d56c3d3 100644
--- a/MAC/GCF/_PALlight/CEP-PMLlight/src/PIClient.h
+++ b/MAC/GCF/_PALlight/CEP-PMLlight/src/PIClient.h
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PALlight/PMLlight/src/GCF_RTAnswer.cc b/MAC/GCF/_PALlight/PMLlight/src/GCF_RTAnswer.cc
index 10f87ef3544..bd9e1ce70e2 100644
--- a/MAC/GCF/_PALlight/PMLlight/src/GCF_RTAnswer.cc
+++ b/MAC/GCF/_PALlight/PMLlight/src/GCF_RTAnswer.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PALlight/PMLlight/src/GCF_RTMyProperty.cc b/MAC/GCF/_PALlight/PMLlight/src/GCF_RTMyProperty.cc
index dd01c9a1b20..cf993de516a 100644
--- a/MAC/GCF/_PALlight/PMLlight/src/GCF_RTMyProperty.cc
+++ b/MAC/GCF/_PALlight/PMLlight/src/GCF_RTMyProperty.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PALlight/PMLlight/src/GCF_RTMyPropertySet.cc b/MAC/GCF/_PALlight/PMLlight/src/GCF_RTMyPropertySet.cc
index b3ef8906423..c0d9a4b105b 100644
--- a/MAC/GCF/_PALlight/PMLlight/src/GCF_RTMyPropertySet.cc
+++ b/MAC/GCF/_PALlight/PMLlight/src/GCF_RTMyPropertySet.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PALlight/PMLlight/src/GPM_RTController.cc b/MAC/GCF/_PALlight/PMLlight/src/GPM_RTController.cc
index c7552263aad..3a58adaab41 100644
--- a/MAC/GCF/_PALlight/PMLlight/src/GPM_RTController.cc
+++ b/MAC/GCF/_PALlight/PMLlight/src/GPM_RTController.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PALlight/PMLlight/src/GPM_RTController.h b/MAC/GCF/_PALlight/PMLlight/src/GPM_RTController.h
index 1ff8e3ac5ad..18aef6dba13 100644
--- a/MAC/GCF/_PALlight/PMLlight/src/GPM_RTController.h
+++ b/MAC/GCF/_PALlight/PMLlight/src/GPM_RTController.h
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PALlight/PMLlight/src/GPM_RTDefines.h b/MAC/GCF/_PALlight/PMLlight/src/GPM_RTDefines.h
index 80bf922df4d..82ffce69f16 100644
--- a/MAC/GCF/_PALlight/PMLlight/src/GPM_RTDefines.h
+++ b/MAC/GCF/_PALlight/PMLlight/src/GPM_RTDefines.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PALlight/include/GCF/PALlight/CEPProperty.h b/MAC/GCF/_PALlight/include/GCF/PALlight/CEPProperty.h
index 7cc2ca8fdaf..7ae4d036575 100644
--- a/MAC/GCF/_PALlight/include/GCF/PALlight/CEPProperty.h
+++ b/MAC/GCF/_PALlight/include/GCF/PALlight/CEPProperty.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PALlight/include/GCF/PALlight/CEPPropertySet.h b/MAC/GCF/_PALlight/include/GCF/PALlight/CEPPropertySet.h
index 0b4ec365148..48c7d5fada9 100644
--- a/MAC/GCF/_PALlight/include/GCF/PALlight/CEPPropertySet.h
+++ b/MAC/GCF/_PALlight/include/GCF/PALlight/CEPPropertySet.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PALlight/include/GCF/PALlight/GCF_RTAnswer.h b/MAC/GCF/_PALlight/include/GCF/PALlight/GCF_RTAnswer.h
index eb6ad333883..6de799167be 100644
--- a/MAC/GCF/_PALlight/include/GCF/PALlight/GCF_RTAnswer.h
+++ b/MAC/GCF/_PALlight/include/GCF/PALlight/GCF_RTAnswer.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PALlight/include/GCF/PALlight/GCF_RTMyProperty.h b/MAC/GCF/_PALlight/include/GCF/PALlight/GCF_RTMyProperty.h
index 53d2ba62e1f..d9a4361f773 100644
--- a/MAC/GCF/_PALlight/include/GCF/PALlight/GCF_RTMyProperty.h
+++ b/MAC/GCF/_PALlight/include/GCF/PALlight/GCF_RTMyProperty.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/GCF/_PALlight/include/GCF/PALlight/GCF_RTMyPropertySet.h b/MAC/GCF/_PALlight/include/GCF/PALlight/GCF_RTMyPropertySet.h
index a9ca98617ed..ee1c23afb06 100644
--- a/MAC/GCF/_PALlight/include/GCF/PALlight/GCF_RTMyPropertySet.h
+++ b/MAC/GCF/_PALlight/include/GCF/PALlight/GCF_RTMyPropertySet.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/MACIO/autogen/MACIO.py b/MAC/MACIO/autogen/MACIO.py
index 7c564ecceee..b9597dbe095 100644
--- a/MAC/MACIO/autogen/MACIO.py
+++ b/MAC/MACIO/autogen/MACIO.py
@@ -5,7 +5,7 @@
 #
 #  Copyright (C) 2013
 #  ASTRON (Netherlands Foundation for Research in Astronomy)
-#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 #
 
 #  This program is free software: you can redistribute it and/or modify it
diff --git a/MAC/MACIO/autogen/protocol.tpl b/MAC/MACIO/autogen/protocol.tpl
index 53fc8104c5a..763352f1284 100644
--- a/MAC/MACIO/autogen/protocol.tpl
+++ b/MAC/MACIO/autogen/protocol.tpl
@@ -21,7 +21,7 @@
 //
 //  Copyright (C) 2003-2012
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 [+ IF (== autogen-version "5.12") +]
 //  [+ (lgpl "This program" "ASTRON" "//  ") +]
diff --git a/MAC/MACIO/autogen/pytocol.tpl b/MAC/MACIO/autogen/pytocol.tpl
index 95862d01136..0f4959a6757 100644
--- a/MAC/MACIO/autogen/pytocol.tpl
+++ b/MAC/MACIO/autogen/pytocol.tpl
@@ -8,7 +8,7 @@
 #
 #  Copyright (C) 2003-2013
 #  ASTRON (Netherlands Foundation for Research in Astronomy)
-#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 #
 [+ IF (== autogen-version "5.12") +]
 #  [+ (lgpl "This program" "ASTRON" "#  ") +]
diff --git a/MAC/MACIO/include/MACIO/DoubleVector.h b/MAC/MACIO/include/MACIO/DoubleVector.h
index 136f9566820..f3ef5c47528 100644
--- a/MAC/MACIO/include/MACIO/DoubleVector.h
+++ b/MAC/MACIO/include/MACIO/DoubleVector.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/MACIO/include/MACIO/EventPort.h b/MAC/MACIO/include/MACIO/EventPort.h
index ec8ba7ef31c..307ecf5909b 100644
--- a/MAC/MACIO/include/MACIO/EventPort.h
+++ b/MAC/MACIO/include/MACIO/EventPort.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/MACIO/include/MACIO/GCF_Event.h b/MAC/MACIO/include/MACIO/GCF_Event.h
index aa472cf2212..e084f8784c4 100644
--- a/MAC/MACIO/include/MACIO/GCF_Event.h
+++ b/MAC/MACIO/include/MACIO/GCF_Event.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/MACIO/include/MACIO/KVTLogger.h b/MAC/MACIO/include/MACIO/KVTLogger.h
index 6a2cc363ab2..6b099b91994 100644
--- a/MAC/MACIO/include/MACIO/KVTLogger.h
+++ b/MAC/MACIO/include/MACIO/KVTLogger.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2010
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/MACIO/include/MACIO/MACServiceInfo.h b/MAC/MACIO/include/MACIO/MACServiceInfo.h
index 247d8bc57c5..04ee0d70a05 100644
--- a/MAC/MACIO/include/MACIO/MACServiceInfo.h
+++ b/MAC/MACIO/include/MACIO/MACServiceInfo.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/MACIO/include/MACIO/Marshalling.tcc b/MAC/MACIO/include/MACIO/Marshalling.tcc
index ad0d9321aa9..0e8b571c28a 100644
--- a/MAC/MACIO/include/MACIO/Marshalling.tcc
+++ b/MAC/MACIO/include/MACIO/Marshalling.tcc
@@ -4,7 +4,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/MACIO/include/MACIO/ProtocolDefs.h b/MAC/MACIO/include/MACIO/ProtocolDefs.h
index ea155c1b8be..2415a795533 100644
--- a/MAC/MACIO/include/MACIO/ProtocolDefs.h
+++ b/MAC/MACIO/include/MACIO/ProtocolDefs.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/MACIO/include/MACIO/RTmetadata.h b/MAC/MACIO/include/MACIO/RTmetadata.h
index 096851cfbc0..de776587deb 100644
--- a/MAC/MACIO/include/MACIO/RTmetadata.h
+++ b/MAC/MACIO/include/MACIO/RTmetadata.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2013-2014
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/MACIO/include/MACIO/StringVector.h b/MAC/MACIO/include/MACIO/StringVector.h
index 26a7e4f01ad..15dd7e5c49e 100644
--- a/MAC/MACIO/include/MACIO/StringVector.h
+++ b/MAC/MACIO/include/MACIO/StringVector.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/MACIO/src/EventPort.cc b/MAC/MACIO/src/EventPort.cc
index 5a902c13fd6..fceda40f61f 100644
--- a/MAC/MACIO/src/EventPort.cc
+++ b/MAC/MACIO/src/EventPort.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/MACIO/src/GCF_Event.cc b/MAC/MACIO/src/GCF_Event.cc
index 6cbef362f9d..4198d9d7f64 100644
--- a/MAC/MACIO/src/GCF_Event.cc
+++ b/MAC/MACIO/src/GCF_Event.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/MACIO/src/KVTLogger.cc b/MAC/MACIO/src/KVTLogger.cc
index 52a16853562..5c1620b6ee7 100644
--- a/MAC/MACIO/src/KVTLogger.cc
+++ b/MAC/MACIO/src/KVTLogger.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2010
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/MACIO/src/KVT_Protocol.prot b/MAC/MACIO/src/KVT_Protocol.prot
index fc36ccbb2e8..d2540563858 100644
--- a/MAC/MACIO/src/KVT_Protocol.prot
+++ b/MAC/MACIO/src/KVT_Protocol.prot
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/MACIO/src/LOG_Protocol.prot b/MAC/MACIO/src/LOG_Protocol.prot
index db42271361a..ecc1891b83d 100644
--- a/MAC/MACIO/src/LOG_Protocol.prot
+++ b/MAC/MACIO/src/LOG_Protocol.prot
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/MACIO/src/ProtocolDefs.cc b/MAC/MACIO/src/ProtocolDefs.cc
index f8aef9fceba..85c13e27c2e 100644
--- a/MAC/MACIO/src/ProtocolDefs.cc
+++ b/MAC/MACIO/src/ProtocolDefs.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2007-2008
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/MACIO/src/RTmetadata.cc b/MAC/MACIO/src/RTmetadata.cc
index 36d92d0cc10..12bbeb7f8d2 100644
--- a/MAC/MACIO/src/RTmetadata.cc
+++ b/MAC/MACIO/src/RTmetadata.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2013-2014
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/MACIO/src/SB_Protocol.prot b/MAC/MACIO/src/SB_Protocol.prot
index ecb81edda5d..dcabca365c1 100644
--- a/MAC/MACIO/src/SB_Protocol.prot
+++ b/MAC/MACIO/src/SB_Protocol.prot
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/MACIO/test/tClone.cc b/MAC/MACIO/test/tClone.cc
index 3cf69d07ce7..f8ed9a14009 100644
--- a/MAC/MACIO/test/tClone.cc
+++ b/MAC/MACIO/test/tClone.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2009
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/MACIO/test/tEventPort.cc b/MAC/MACIO/test/tEventPort.cc
index 458d8170b22..6c95d91665a 100644
--- a/MAC/MACIO/test/tEventPort.cc
+++ b/MAC/MACIO/test/tEventPort.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/MACIO/test/tKVTLogger.cc b/MAC/MACIO/test/tKVTLogger.cc
index 63f078e4a02..0c9d64fcb50 100644
--- a/MAC/MACIO/test/tKVTLogger.cc
+++ b/MAC/MACIO/test/tKVTLogger.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2011
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/MACIO/test/tMarshalling.cc b/MAC/MACIO/test/tMarshalling.cc
index 6eae8e24c21..013bfe578a9 100644
--- a/MAC/MACIO/test/tMarshalling.cc
+++ b/MAC/MACIO/test/tMarshalling.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/MACIO/test/tMarshalling.h b/MAC/MACIO/test/tMarshalling.h
index 89ff7e5cb46..306ca88a4be 100644
--- a/MAC/MACIO/test/tMarshalling.h
+++ b/MAC/MACIO/test/tMarshalling.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/MACIO/test/tProtocol.cc b/MAC/MACIO/test/tProtocol.cc
index a90d2b7d1c0..56423b0e39c 100644
--- a/MAC/MACIO/test/tProtocol.cc
+++ b/MAC/MACIO/test/tProtocol.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/MACIO/test/tRTmetadata.cc b/MAC/MACIO/test/tRTmetadata.cc
index e3c76618ed9..75c0ee65467 100644
--- a/MAC/MACIO/test/tRTmetadata.cc
+++ b/MAC/MACIO/test/tRTmetadata.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2014
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/MACIO/test/testprotocol.prot b/MAC/MACIO/test/testprotocol.prot
index fab32b28692..2e35d66c211 100644
--- a/MAC/MACIO/test/testprotocol.prot
+++ b/MAC/MACIO/test/testprotocol.prot
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Navigator2/scripts/gcf_cwd.ctl b/MAC/Navigator2/scripts/gcf_cwd.ctl
index c4d9dac0a1c..3abf4041622 100644
--- a/MAC/Navigator2/scripts/gcf_cwd.ctl
+++ b/MAC/Navigator2/scripts/gcf_cwd.ctl
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Navigator2/scripts/libs/CEP_Processes.ctl b/MAC/Navigator2/scripts/libs/CEP_Processes.ctl
index 756ca71e89a..94b8456e3d2 100644
--- a/MAC/Navigator2/scripts/libs/CEP_Processes.ctl
+++ b/MAC/Navigator2/scripts/libs/CEP_Processes.ctl
@@ -2,7 +2,7 @@
 //
 //  Copyright (C) 2002-2004
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Navigator2/scripts/libs/GCFAlarm.ctl b/MAC/Navigator2/scripts/libs/GCFAlarm.ctl
index cb79aa56ff1..dd408e29549 100644
--- a/MAC/Navigator2/scripts/libs/GCFAlarm.ctl
+++ b/MAC/Navigator2/scripts/libs/GCFAlarm.ctl
@@ -2,7 +2,7 @@
 //
 //  Copyright (C) 2002-2004
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Navigator2/scripts/libs/GCFCWD.ctl b/MAC/Navigator2/scripts/libs/GCFCWD.ctl
index 0c47ff121dd..dca0a8d951c 100644
--- a/MAC/Navigator2/scripts/libs/GCFCWD.ctl
+++ b/MAC/Navigator2/scripts/libs/GCFCWD.ctl
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Navigator2/scripts/libs/GCFCommon.ctl b/MAC/Navigator2/scripts/libs/GCFCommon.ctl
index 58da234d3f5..0fbf30539b6 100644
--- a/MAC/Navigator2/scripts/libs/GCFCommon.ctl
+++ b/MAC/Navigator2/scripts/libs/GCFCommon.ctl
@@ -2,7 +2,7 @@
 //
 //  Copyright (C) 2002-2004
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Navigator2/scripts/libs/GCFCommon_prod.ctl b/MAC/Navigator2/scripts/libs/GCFCommon_prod.ctl
index eed2eb61caf..05a0917eaac 100644
--- a/MAC/Navigator2/scripts/libs/GCFCommon_prod.ctl
+++ b/MAC/Navigator2/scripts/libs/GCFCommon_prod.ctl
@@ -2,7 +2,7 @@
 //
 //  Copyright (C) 2002-2004
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Navigator2/scripts/libs/GCFCommon_test.ctl b/MAC/Navigator2/scripts/libs/GCFCommon_test.ctl
index a4c7206d4cb..7cdb600a36e 100644
--- a/MAC/Navigator2/scripts/libs/GCFCommon_test.ctl
+++ b/MAC/Navigator2/scripts/libs/GCFCommon_test.ctl
@@ -2,7 +2,7 @@
 //
 //  Copyright (C) 2002-2004
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Navigator2/scripts/libs/GCFLogging.ctl b/MAC/Navigator2/scripts/libs/GCFLogging.ctl
index d17a91663c4..d2baa439f5c 100644
--- a/MAC/Navigator2/scripts/libs/GCFLogging.ctl
+++ b/MAC/Navigator2/scripts/libs/GCFLogging.ctl
@@ -2,7 +2,7 @@
 //
 //  Copyright (C) 2002-2004
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Navigator2/scripts/libs/MainCU_Processes.ctl b/MAC/Navigator2/scripts/libs/MainCU_Processes.ctl
index 1d1dca16251..509555209e5 100644
--- a/MAC/Navigator2/scripts/libs/MainCU_Processes.ctl
+++ b/MAC/Navigator2/scripts/libs/MainCU_Processes.ctl
@@ -2,7 +2,7 @@
 //
 //  Copyright (C) 2002-2004
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Navigator2/scripts/libs/Station_Processes.ctl b/MAC/Navigator2/scripts/libs/Station_Processes.ctl
index 558bd3ab2d2..d330b3f5b1a 100644
--- a/MAC/Navigator2/scripts/libs/Station_Processes.ctl
+++ b/MAC/Navigator2/scripts/libs/Station_Processes.ctl
@@ -2,7 +2,7 @@
 //
 //  Copyright (C) 2002-2004
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Navigator2/scripts/libs/claimManager.ctl b/MAC/Navigator2/scripts/libs/claimManager.ctl
index 81aa9211fb0..b8583737fef 100644
--- a/MAC/Navigator2/scripts/libs/claimManager.ctl
+++ b/MAC/Navigator2/scripts/libs/claimManager.ctl
@@ -2,7 +2,7 @@
 //
 //  Copyright (C) 2002-2004
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Navigator2/scripts/libs/navConfig.ctl b/MAC/Navigator2/scripts/libs/navConfig.ctl
index de42f0f4711..a8423e23887 100644
--- a/MAC/Navigator2/scripts/libs/navConfig.ctl
+++ b/MAC/Navigator2/scripts/libs/navConfig.ctl
@@ -2,7 +2,7 @@
 //
 //  Copyright (C) 2002-2004
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Navigator2/scripts/libs/navCtrl.ctl b/MAC/Navigator2/scripts/libs/navCtrl.ctl
index db4588f33bb..f359bcdf049 100644
--- a/MAC/Navigator2/scripts/libs/navCtrl.ctl
+++ b/MAC/Navigator2/scripts/libs/navCtrl.ctl
@@ -2,7 +2,7 @@
 //
 //  Copyright (C) 2002-2004  // TabChanoged: The Tab has changed, so a new panel needs to be initialized and put in place
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Navigator2/scripts/libs/navFunct.ctl b/MAC/Navigator2/scripts/libs/navFunct.ctl
index 490c94445b3..f4a341a6074 100644
--- a/MAC/Navigator2/scripts/libs/navFunct.ctl
+++ b/MAC/Navigator2/scripts/libs/navFunct.ctl
@@ -2,7 +2,7 @@
 //
 //  Copyright (C) 2002-2004
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Navigator2/scripts/libs/navPanel.ctl b/MAC/Navigator2/scripts/libs/navPanel.ctl
index 2512aa11e53..5125f0f0208 100644
--- a/MAC/Navigator2/scripts/libs/navPanel.ctl
+++ b/MAC/Navigator2/scripts/libs/navPanel.ctl
@@ -2,7 +2,7 @@
 //
 //  Copyright (C) 2002-2004
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Navigator2/scripts/libs/navProgressCtrl.ctl b/MAC/Navigator2/scripts/libs/navProgressCtrl.ctl
index addd76e08db..8194d6e3053 100644
--- a/MAC/Navigator2/scripts/libs/navProgressCtrl.ctl
+++ b/MAC/Navigator2/scripts/libs/navProgressCtrl.ctl
@@ -2,7 +2,7 @@
 //
 //  Copyright (C) 2002-2015
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Navigator2/scripts/libs/navTabCtrl.ctl b/MAC/Navigator2/scripts/libs/navTabCtrl.ctl
index d70a427c3cb..12d0a383768 100644
--- a/MAC/Navigator2/scripts/libs/navTabCtrl.ctl
+++ b/MAC/Navigator2/scripts/libs/navTabCtrl.ctl
@@ -2,7 +2,7 @@
 //
 //  Copyright (C) 2002-2004
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Navigator2/scripts/libs/navigator.ctl b/MAC/Navigator2/scripts/libs/navigator.ctl
index d63ebcd1e39..eb719358e7a 100644
--- a/MAC/Navigator2/scripts/libs/navigator.ctl
+++ b/MAC/Navigator2/scripts/libs/navigator.ctl
@@ -2,7 +2,7 @@
 //
 //  Copyright (C) 2002-2004
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Navigator2/scripts/monitorAlarms.ctl b/MAC/Navigator2/scripts/monitorAlarms.ctl
index 1f446375ea8..79ea722ec1f 100644
--- a/MAC/Navigator2/scripts/monitorAlarms.ctl
+++ b/MAC/Navigator2/scripts/monitorAlarms.ctl
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2007-2008
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Navigator2/scripts/monitorStateChanges.ctl b/MAC/Navigator2/scripts/monitorStateChanges.ctl
index 164054d9a5a..c87f7ab2bc1 100644
--- a/MAC/Navigator2/scripts/monitorStateChanges.ctl
+++ b/MAC/Navigator2/scripts/monitorStateChanges.ctl
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2007-2008
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Navigator2/scripts/monitorStateReset.ctl b/MAC/Navigator2/scripts/monitorStateReset.ctl
index 60be1018237..acf0379decd 100644
--- a/MAC/Navigator2/scripts/monitorStateReset.ctl
+++ b/MAC/Navigator2/scripts/monitorStateReset.ctl
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2007-2008
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Navigator2/scripts/monitorStationAlarms.ctl b/MAC/Navigator2/scripts/monitorStationAlarms.ctl
index 6fc19403032..00cf5223045 100644
--- a/MAC/Navigator2/scripts/monitorStationAlarms.ctl
+++ b/MAC/Navigator2/scripts/monitorStationAlarms.ctl
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2007-2008
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Navigator2/scripts/readStationConfigs.ctl b/MAC/Navigator2/scripts/readStationConfigs.ctl
index 70c16b56641..7181cadc85b 100644
--- a/MAC/Navigator2/scripts/readStationConfigs.ctl
+++ b/MAC/Navigator2/scripts/readStationConfigs.ctl
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2007-2008
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Navigator2/scripts/readStationConnections.ctl b/MAC/Navigator2/scripts/readStationConnections.ctl
index cfb5c82f552..bd46abc224a 100644
--- a/MAC/Navigator2/scripts/readStationConnections.ctl
+++ b/MAC/Navigator2/scripts/readStationConnections.ctl
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2007-2008
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/GCF/CEP/src/CEPEcho.cc b/MAC/Test/GCF/CEP/src/CEPEcho.cc
index cfd4c9b9b40..8b6fbdf2955 100644
--- a/MAC/Test/GCF/CEP/src/CEPEcho.cc
+++ b/MAC/Test/GCF/CEP/src/CEPEcho.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/GCF/CEP/src/CEPPing.cc b/MAC/Test/GCF/CEP/src/CEPPing.cc
index 0312918cf01..2c4c115278c 100644
--- a/MAC/Test/GCF/CEP/src/CEPPing.cc
+++ b/MAC/Test/GCF/CEP/src/CEPPing.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/GCF/CEP/src/DH_EchoPing.cc b/MAC/Test/GCF/CEP/src/DH_EchoPing.cc
index 2411d5c5fcd..16516a71022 100644
--- a/MAC/Test/GCF/CEP/src/DH_EchoPing.cc
+++ b/MAC/Test/GCF/CEP/src/DH_EchoPing.cc
@@ -2,7 +2,7 @@
 //
 //  Copyright (C) 2000, 2001
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/GCF/CEP/src/DH_EchoPing.h b/MAC/Test/GCF/CEP/src/DH_EchoPing.h
index c307597ad91..1ffc90ef7df 100644
--- a/MAC/Test/GCF/CEP/src/DH_EchoPing.h
+++ b/MAC/Test/GCF/CEP/src/DH_EchoPing.h
@@ -2,7 +2,7 @@
 //#
 //# Copyright (C) 2004
 //# ASTRON (Netherlands Foundation for Research in Astronomy)
-//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //# This program is free software; you can redistribute it and/or modify
 //# it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/GCF/MAC/src/PropertyProxy.cc b/MAC/Test/GCF/MAC/src/PropertyProxy.cc
index 82a95fe42fd..b8eae333fc6 100644
--- a/MAC/Test/GCF/MAC/src/PropertyProxy.cc
+++ b/MAC/Test/GCF/MAC/src/PropertyProxy.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/GCF/MAC/src/PropertyProxy.h b/MAC/Test/GCF/MAC/src/PropertyProxy.h
index 27cc0e5533d..99a041a5e64 100644
--- a/MAC/Test/GCF/MAC/src/PropertyProxy.h
+++ b/MAC/Test/GCF/MAC/src/PropertyProxy.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/GCF/RTC/src/RTEcho.cc b/MAC/Test/GCF/RTC/src/RTEcho.cc
index 3b97fde6e42..ee11ca5916c 100644
--- a/MAC/Test/GCF/RTC/src/RTEcho.cc
+++ b/MAC/Test/GCF/RTC/src/RTEcho.cc
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/GCF/RTC/src/RTEcho.h b/MAC/Test/GCF/RTC/src/RTEcho.h
index f8854154f16..baa7b91e754 100644
--- a/MAC/Test/GCF/RTC/src/RTEcho.h
+++ b/MAC/Test/GCF/RTC/src/RTEcho.h
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/GCF/RTC/src/RTPing.cc b/MAC/Test/GCF/RTC/src/RTPing.cc
index 755ee05d9e4..b6baffccfda 100644
--- a/MAC/Test/GCF/RTC/src/RTPing.cc
+++ b/MAC/Test/GCF/RTC/src/RTPing.cc
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/GCF/RTC/src/RTPing.h b/MAC/Test/GCF/RTC/src/RTPing.h
index 0e9772151d1..28a12bf072d 100644
--- a/MAC/Test/GCF/RTC/src/RTPing.h
+++ b/MAC/Test/GCF/RTC/src/RTPing.h
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/Event/GCF/GCF_Event.h b/MAC/Test/PROTO/Event/GCF/GCF_Event.h
index 54892a0a10e..591a4ffe8ea 100644
--- a/MAC/Test/PROTO/Event/GCF/GCF_Event.h
+++ b/MAC/Test/PROTO/Event/GCF/GCF_Event.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/Event/GCF/GCF_TMProtocols.h b/MAC/Test/PROTO/Event/GCF/GCF_TMProtocols.h
index 497b0a6af20..7d202e4bcd7 100644
--- a/MAC/Test/PROTO/Event/GCF/GCF_TMProtocols.h
+++ b/MAC/Test/PROTO/Event/GCF/GCF_TMProtocols.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/Event/GCF_Event.cc b/MAC/Test/PROTO/Event/GCF_Event.cc
index ef9f808bc65..b896e27bb33 100644
--- a/MAC/Test/PROTO/Event/GCF_Event.cc
+++ b/MAC/Test/PROTO/Event/GCF_Event.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/Event/protocol.tpl b/MAC/Test/PROTO/Event/protocol.tpl
index 2ed27b0781e..303de983888 100644
--- a/MAC/Test/PROTO/Event/protocol.tpl
+++ b/MAC/Test/PROTO/Event/protocol.tpl
@@ -19,7 +19,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 [+ IF (== autogen-version "5.12") +]
 //  [+ (lgpl "This program" "ASTRON" "//  ") +]
diff --git a/MAC/Test/PROTO/Event/protocol.tpl.ph-only b/MAC/Test/PROTO/Event/protocol.tpl.ph-only
index 4f9c9601c8f..b6db0a8ee4b 100644
--- a/MAC/Test/PROTO/Event/protocol.tpl.ph-only
+++ b/MAC/Test/PROTO/Event/protocol.tpl.ph-only
@@ -19,7 +19,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 [+ (lgpl "This program" "ASTRON" "//  ") +]
 //
diff --git a/MAC/Test/PROTO/EventExt/GCF/GCF_Event.h b/MAC/Test/PROTO/EventExt/GCF/GCF_Event.h
index 1a80e106df2..37cdd93a2e3 100644
--- a/MAC/Test/PROTO/EventExt/GCF/GCF_Event.h
+++ b/MAC/Test/PROTO/EventExt/GCF/GCF_Event.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/EventExt/GCF/GCF_TMProtocols.h b/MAC/Test/PROTO/EventExt/GCF/GCF_TMProtocols.h
index 5d1c756180b..abd99130a19 100644
--- a/MAC/Test/PROTO/EventExt/GCF/GCF_TMProtocols.h
+++ b/MAC/Test/PROTO/EventExt/GCF/GCF_TMProtocols.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/EventExt/protocol.tpl b/MAC/Test/PROTO/EventExt/protocol.tpl
index dd78a876e34..def63f91551 100644
--- a/MAC/Test/PROTO/EventExt/protocol.tpl
+++ b/MAC/Test/PROTO/EventExt/protocol.tpl
@@ -27,7 +27,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 [+ IF (== autogen-version "5.12") +]
 //  [+ (lgpl "This program" "ASTRON" "//  ") +]
diff --git a/MAC/Test/PROTO/EventExt/pybind.ph b/MAC/Test/PROTO/EventExt/pybind.ph
index 82c26d798e0..493d71f15f6 100644
--- a/MAC/Test/PROTO/EventExt/pybind.ph
+++ b/MAC/Test/PROTO/EventExt/pybind.ph
@@ -9,7 +9,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
diff --git a/MAC/Test/PROTO/PI/autogen/protocol.tpl b/MAC/Test/PROTO/PI/autogen/protocol.tpl
index 54921840519..6c71623c60d 100644
--- a/MAC/Test/PROTO/PI/autogen/protocol.tpl
+++ b/MAC/Test/PROTO/PI/autogen/protocol.tpl
@@ -15,7 +15,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 [+ IF (== autogen-version "5.12") +]
 //  [+ (lgpl "This program" "ASTRON" "//  ") +]
diff --git a/MAC/Test/PROTO/PROP/src/FPBoolValue.cc b/MAC/Test/PROTO/PROP/src/FPBoolValue.cc
index 3d876899a68..c47d691f1a4 100644
--- a/MAC/Test/PROTO/PROP/src/FPBoolValue.cc
+++ b/MAC/Test/PROTO/PROP/src/FPBoolValue.cc
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/PROP/src/FPBoolValue.h b/MAC/Test/PROTO/PROP/src/FPBoolValue.h
index 03ef718e9aa..23a1a6231a7 100644
--- a/MAC/Test/PROTO/PROP/src/FPBoolValue.h
+++ b/MAC/Test/PROTO/PROP/src/FPBoolValue.h
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/PROP/src/FPByteValue.cc b/MAC/Test/PROTO/PROP/src/FPByteValue.cc
index 3f47822cab8..81a07bcddb3 100644
--- a/MAC/Test/PROTO/PROP/src/FPByteValue.cc
+++ b/MAC/Test/PROTO/PROP/src/FPByteValue.cc
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/PROP/src/FPByteValue.h b/MAC/Test/PROTO/PROP/src/FPByteValue.h
index fff3c34f3fa..f5023826a6e 100644
--- a/MAC/Test/PROTO/PROP/src/FPByteValue.h
+++ b/MAC/Test/PROTO/PROP/src/FPByteValue.h
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/PROP/src/FPDWordValue.cc b/MAC/Test/PROTO/PROP/src/FPDWordValue.cc
index 4b8a8dcf044..08b3c33c2f8 100644
--- a/MAC/Test/PROTO/PROP/src/FPDWordValue.cc
+++ b/MAC/Test/PROTO/PROP/src/FPDWordValue.cc
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/PROP/src/FPDWordValue.h b/MAC/Test/PROTO/PROP/src/FPDWordValue.h
index c7f15544b7a..98d8787a661 100644
--- a/MAC/Test/PROTO/PROP/src/FPDWordValue.h
+++ b/MAC/Test/PROTO/PROP/src/FPDWordValue.h
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/PROP/src/FPDoubleValue.cc b/MAC/Test/PROTO/PROP/src/FPDoubleValue.cc
index 918e2171e69..852dc6e5136 100644
--- a/MAC/Test/PROTO/PROP/src/FPDoubleValue.cc
+++ b/MAC/Test/PROTO/PROP/src/FPDoubleValue.cc
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/PROP/src/FPDoubleValue.h b/MAC/Test/PROTO/PROP/src/FPDoubleValue.h
index 4fe22e42806..409cdf541d9 100644
--- a/MAC/Test/PROTO/PROP/src/FPDoubleValue.h
+++ b/MAC/Test/PROTO/PROP/src/FPDoubleValue.h
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/PROP/src/FPFloatValue.cc b/MAC/Test/PROTO/PROP/src/FPFloatValue.cc
index ea379ed9432..88142d38ba5 100644
--- a/MAC/Test/PROTO/PROP/src/FPFloatValue.cc
+++ b/MAC/Test/PROTO/PROP/src/FPFloatValue.cc
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/PROP/src/FPFloatValue.h b/MAC/Test/PROTO/PROP/src/FPFloatValue.h
index 5ea1838fc25..9db3ee2703e 100644
--- a/MAC/Test/PROTO/PROP/src/FPFloatValue.h
+++ b/MAC/Test/PROTO/PROP/src/FPFloatValue.h
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/PROP/src/FPLongLongValue.cc b/MAC/Test/PROTO/PROP/src/FPLongLongValue.cc
index 33611d34b51..b28dd0433c2 100644
--- a/MAC/Test/PROTO/PROP/src/FPLongLongValue.cc
+++ b/MAC/Test/PROTO/PROP/src/FPLongLongValue.cc
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/PROP/src/FPLongLongValue.h b/MAC/Test/PROTO/PROP/src/FPLongLongValue.h
index 81866f36d7b..ee871b3f75b 100644
--- a/MAC/Test/PROTO/PROP/src/FPLongLongValue.h
+++ b/MAC/Test/PROTO/PROP/src/FPLongLongValue.h
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/PROP/src/FPValue.cc b/MAC/Test/PROTO/PROP/src/FPValue.cc
index 59384f10177..938d69ce58d 100644
--- a/MAC/Test/PROTO/PROP/src/FPValue.cc
+++ b/MAC/Test/PROTO/PROP/src/FPValue.cc
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/PROP/src/FPValue.h b/MAC/Test/PROTO/PROP/src/FPValue.h
index 909a131bffc..924fc46670b 100644
--- a/MAC/Test/PROTO/PROP/src/FPValue.h
+++ b/MAC/Test/PROTO/PROP/src/FPValue.h
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/PROP/src/FPWordValue.cc b/MAC/Test/PROTO/PROP/src/FPWordValue.cc
index eab648b8611..8bb4ace9d9a 100644
--- a/MAC/Test/PROTO/PROP/src/FPWordValue.cc
+++ b/MAC/Test/PROTO/PROP/src/FPWordValue.cc
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/PROP/src/FPWordValue.h b/MAC/Test/PROTO/PROP/src/FPWordValue.h
index 237d6e9fdc3..972aaffe91f 100644
--- a/MAC/Test/PROTO/PROP/src/FPWordValue.h
+++ b/MAC/Test/PROTO/PROP/src/FPWordValue.h
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/PROP/src/FProperty.cc b/MAC/Test/PROTO/PROP/src/FProperty.cc
index 7b917f82403..0bcd5824720 100644
--- a/MAC/Test/PROTO/PROP/src/FProperty.cc
+++ b/MAC/Test/PROTO/PROP/src/FProperty.cc
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/PROP/src/FProperty.h b/MAC/Test/PROTO/PROP/src/FProperty.h
index 6a3e5a978f0..a8e233d9631 100644
--- a/MAC/Test/PROTO/PROP/src/FProperty.h
+++ b/MAC/Test/PROTO/PROP/src/FProperty.h
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/TASK/src/GCF_Defines.hxx b/MAC/Test/PROTO/TASK/src/GCF_Defines.hxx
index 46c8735b6ea..179ea78e2be 100644
--- a/MAC/Test/PROTO/TASK/src/GCF_Defines.hxx
+++ b/MAC/Test/PROTO/TASK/src/GCF_Defines.hxx
@@ -2,7 +2,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/TASK/src/GCF_Event.hxx b/MAC/Test/PROTO/TASK/src/GCF_Event.hxx
index c6e4b60c1e3..e5d0d7c11ce 100644
--- a/MAC/Test/PROTO/TASK/src/GCF_Event.hxx
+++ b/MAC/Test/PROTO/TASK/src/GCF_Event.hxx
@@ -2,7 +2,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/TASK/src/GCF_Fsm.cxx b/MAC/Test/PROTO/TASK/src/GCF_Fsm.cxx
index d7e7f13e934..f04fbd7f333 100644
--- a/MAC/Test/PROTO/TASK/src/GCF_Fsm.cxx
+++ b/MAC/Test/PROTO/TASK/src/GCF_Fsm.cxx
@@ -2,7 +2,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/TASK/src/GCF_Fsm.hxx b/MAC/Test/PROTO/TASK/src/GCF_Fsm.hxx
index 6fa458e2722..a6c4bf9aa0a 100644
--- a/MAC/Test/PROTO/TASK/src/GCF_Fsm.hxx
+++ b/MAC/Test/PROTO/TASK/src/GCF_Fsm.hxx
@@ -2,7 +2,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/TASK/src/GCF_PortInterface.hxx b/MAC/Test/PROTO/TASK/src/GCF_PortInterface.hxx
index 2c204b9b2ee..34a6206bf86 100644
--- a/MAC/Test/PROTO/TASK/src/GCF_PortInterface.hxx
+++ b/MAC/Test/PROTO/TASK/src/GCF_PortInterface.hxx
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/TASK/src/GCF_Protocols.cxx b/MAC/Test/PROTO/TASK/src/GCF_Protocols.cxx
index d443f96cbc8..287bddc7960 100644
--- a/MAC/Test/PROTO/TASK/src/GCF_Protocols.cxx
+++ b/MAC/Test/PROTO/TASK/src/GCF_Protocols.cxx
@@ -2,7 +2,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/TASK/src/GCF_Protocols.hxx b/MAC/Test/PROTO/TASK/src/GCF_Protocols.hxx
index 0ab5abefaea..86b81d85058 100644
--- a/MAC/Test/PROTO/TASK/src/GCF_Protocols.hxx
+++ b/MAC/Test/PROTO/TASK/src/GCF_Protocols.hxx
@@ -2,7 +2,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/TASK/src/GCF_Task.cxx b/MAC/Test/PROTO/TASK/src/GCF_Task.cxx
index 73a81ba2d6b..e5302349de5 100644
--- a/MAC/Test/PROTO/TASK/src/GCF_Task.cxx
+++ b/MAC/Test/PROTO/TASK/src/GCF_Task.cxx
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/PROTO/TASK/src/GCF_Task.hxx b/MAC/Test/PROTO/TASK/src/GCF_Task.hxx
index 3751788c927..831905b8f80 100644
--- a/MAC/Test/PROTO/TASK/src/GCF_Task.hxx
+++ b/MAC/Test/PROTO/TASK/src/GCF_Task.hxx
@@ -2,7 +2,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/TestHarness/THEcho/src/THEcho.cc b/MAC/Test/TestHarness/THEcho/src/THEcho.cc
index 597e2418db2..e55c055f4c9 100644
--- a/MAC/Test/TestHarness/THEcho/src/THEcho.cc
+++ b/MAC/Test/TestHarness/THEcho/src/THEcho.cc
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/TestHarness/THEcho/src/THEcho.h b/MAC/Test/TestHarness/THEcho/src/THEcho.h
index 8337cc1a565..4707979ebb1 100644
--- a/MAC/Test/TestHarness/THEcho/src/THEcho.h
+++ b/MAC/Test/TestHarness/THEcho/src/THEcho.h
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/TestHarness/THEcho/test/THEchoTest.cc b/MAC/Test/TestHarness/THEcho/test/THEchoTest.cc
index 8dd5a1ed264..9d908325787 100644
--- a/MAC/Test/TestHarness/THEcho/test/THEchoTest.cc
+++ b/MAC/Test/TestHarness/THEcho/test/THEchoTest.cc
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/TestHarness/THEcho/test/THEchoTest.h b/MAC/Test/TestHarness/THEcho/test/THEchoTest.h
index fd7d6d8049f..c130834681f 100644
--- a/MAC/Test/TestHarness/THEcho/test/THEchoTest.h
+++ b/MAC/Test/TestHarness/THEcho/test/THEchoTest.h
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/TestHarness/THPVSSBridge/src/PropertyProxy.cc b/MAC/Test/TestHarness/THPVSSBridge/src/PropertyProxy.cc
index 6262719cbb3..52055585db8 100644
--- a/MAC/Test/TestHarness/THPVSSBridge/src/PropertyProxy.cc
+++ b/MAC/Test/TestHarness/THPVSSBridge/src/PropertyProxy.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/TestHarness/THPVSSBridge/src/PropertyProxy.h b/MAC/Test/TestHarness/THPVSSBridge/src/PropertyProxy.h
index d7d11ee9bcf..c217a959045 100644
--- a/MAC/Test/TestHarness/THPVSSBridge/src/PropertyProxy.h
+++ b/MAC/Test/TestHarness/THPVSSBridge/src/PropertyProxy.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2003
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/TestHarness/THPVSSBridge/src/THPVSSBridge.cc b/MAC/Test/TestHarness/THPVSSBridge/src/THPVSSBridge.cc
index 94cac3c84d3..a97e6329d43 100644
--- a/MAC/Test/TestHarness/THPVSSBridge/src/THPVSSBridge.cc
+++ b/MAC/Test/TestHarness/THPVSSBridge/src/THPVSSBridge.cc
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/TestHarness/THPVSSBridge/src/THPVSSBridge.h b/MAC/Test/TestHarness/THPVSSBridge/src/THPVSSBridge.h
index 3d37226ef06..a3eeeb7eb0c 100644
--- a/MAC/Test/TestHarness/THPVSSBridge/src/THPVSSBridge.h
+++ b/MAC/Test/TestHarness/THPVSSBridge/src/THPVSSBridge.h
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2003
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/TestHarness/THPVSSBridge/src/THPVSSBridgeMain.cc b/MAC/Test/TestHarness/THPVSSBridge/src/THPVSSBridgeMain.cc
index 3f672bcfb05..f51419a0e65 100644
--- a/MAC/Test/TestHarness/THPVSSBridge/src/THPVSSBridgeMain.cc
+++ b/MAC/Test/TestHarness/THPVSSBridge/src/THPVSSBridgeMain.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2005
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/MAC/Test/TestHarness/TSE/scripts/MACall.tse.prot b/MAC/Test/TestHarness/TSE/scripts/MACall.tse.prot
index 11317d66ca3..1acaaedd0ed 100644
--- a/MAC/Test/TestHarness/TSE/scripts/MACall.tse.prot
+++ b/MAC/Test/TestHarness/TSE/scripts/MACall.tse.prot
@@ -3,7 +3,7 @@
 //
 //  Copyright (C) 2005
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
diff --git a/MAC/Test/TestHarness/protconverter/TSE-protocol.tpl b/MAC/Test/TestHarness/protconverter/TSE-protocol.tpl
index f5a6b122865..61c188273cd 100755
--- a/MAC/Test/TestHarness/protconverter/TSE-protocol.tpl
+++ b/MAC/Test/TestHarness/protconverter/TSE-protocol.tpl
@@ -16,7 +16,7 @@
 //
 //  Copyright (C) 2005
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 [+ IF (== autogen-version "5.12") +]
 //  [+ (lgpl "This program" "ASTRON" "//  ") +]
diff --git a/MAC/Test/TestHarness/protconverter/protconvert.c b/MAC/Test/TestHarness/protconverter/protconvert.c
index 35bff0a4792..c86c3006ecc 100755
--- a/MAC/Test/TestHarness/protconverter/protconvert.c
+++ b/MAC/Test/TestHarness/protconverter/protconvert.c
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2005
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/RTCP/Cobalt/CoInterface/src/BudgetTimer.cc b/RTCP/Cobalt/CoInterface/src/BudgetTimer.cc
index 858103d92f6..497604004d3 100644
--- a/RTCP/Cobalt/CoInterface/src/BudgetTimer.cc
+++ b/RTCP/Cobalt/CoInterface/src/BudgetTimer.cc
@@ -1,6 +1,6 @@
 //#  Copyright (C) 2014
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/RTCP/Cobalt/CoInterface/src/BudgetTimer.h b/RTCP/Cobalt/CoInterface/src/BudgetTimer.h
index a1a59c2e4ce..9f39f493b17 100644
--- a/RTCP/Cobalt/CoInterface/src/BudgetTimer.h
+++ b/RTCP/Cobalt/CoInterface/src/BudgetTimer.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/RTCP/Cobalt/CoInterface/src/Queue.h b/RTCP/Cobalt/CoInterface/src/Queue.h
index 5da14b97124..a2496437468 100644
--- a/RTCP/Cobalt/CoInterface/src/Queue.h
+++ b/RTCP/Cobalt/CoInterface/src/Queue.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/Main.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/Main.java
index 2cef4d74e31..80f5059c0c3 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/Main.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/Main.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/MainFrame.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/MainFrame.java
index f4d0bf82ebc..c3de11c8b1c 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/MainFrame.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/MainFrame.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/SharedVars.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/SharedVars.java
index a39470a0bf5..e139703c44a 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/SharedVars.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/SharedVars.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/exceptions/ConnectionFailedException.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/exceptions/ConnectionFailedException.java
index e2727a69c87..c7563cd0ad5 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/exceptions/ConnectionFailedException.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/exceptions/ConnectionFailedException.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/exceptions/NoAccessException.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/exceptions/NoAccessException.java
index 237f1e397f1..18809c02729 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/exceptions/NoAccessException.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/exceptions/NoAccessException.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/exceptions/NoDatabaseException.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/exceptions/NoDatabaseException.java
index 4a32aac237f..c80fc24587d 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/exceptions/NoDatabaseException.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/exceptions/NoDatabaseException.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/exceptions/NoServerConnectionException.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/exceptions/NoServerConnectionException.java
index 33f46f151dd..adb42b4e8c2 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/exceptions/NoServerConnectionException.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/exceptions/NoServerConnectionException.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/exceptions/NotLoggedInException.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/exceptions/NotLoggedInException.java
index dedab5855ab..10f6b8642bf 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/exceptions/NotLoggedInException.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/exceptions/NotLoggedInException.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/exceptions/ParmDBConfigurationException.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/exceptions/ParmDBConfigurationException.java
index e3b6eb124dd..212dfc48cbc 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/exceptions/ParmDBConfigurationException.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/exceptions/ParmDBConfigurationException.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/ComponentMaintenancePanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/ComponentMaintenancePanel.java
index 7c0d7cb8d22..e6e7a97360c 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/ComponentMaintenancePanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/ComponentMaintenancePanel.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/IPluginPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/IPluginPanel.java
index c26c87e2ab4..9937d013188 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/IPluginPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/IPluginPanel.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/MainPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/MainPanel.java
index 0cbdbd3bb6e..0b76b7eaaf1 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/MainPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/MainPanel.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/ResultBrowserPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/ResultBrowserPanel.java
index bc01ecbf79f..70b2fe3ff55 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/ResultBrowserPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/ResultBrowserPanel.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/SamplePanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/SamplePanel.java
index 7568e25aae8..a3ece610723 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/SamplePanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/SamplePanel.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/TemplateMaintenancePanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/TemplateMaintenancePanel.java
index 60dc5902f24..4c069bac2f4 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/TemplateMaintenancePanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/panels/TemplateMaintenancePanel.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/AccessRights.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/AccessRights.java
index d8a94056e6b..619784321fb 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/AccessRights.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/AccessRights.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/CmdExec.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/CmdExec.java
index f056d3d62b3..4764a1fd775 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/CmdExec.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/CmdExec.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/ConfigPanelHelper.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/ConfigPanelHelper.java
index 5a7b24bcdbd..ccb884f8801 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/ConfigPanelHelper.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/ConfigPanelHelper.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/IViewPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/IViewPanel.java
index 0e7d862a688..86ef14e4782 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/IViewPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/IViewPanel.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/OtdbRmi.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/OtdbRmi.java
index 099129741c6..cb44d8fd21a 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/OtdbRmi.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/OtdbRmi.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/ParmDBConfigurationHelper.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/ParmDBConfigurationHelper.java
index f660c0b023a..b3323efa74d 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/ParmDBConfigurationHelper.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/ParmDBConfigurationHelper.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/ResultPanelHelper.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/ResultPanelHelper.java
index 9b5bb4d6d5c..f52a2b01214 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/ResultPanelHelper.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/ResultPanelHelper.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/SerializableFileContents.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/SerializableFileContents.java
index 60a7e94adb1..075ae3f4b5e 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/SerializableFileContents.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/SerializableFileContents.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/StorageLocation.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/StorageLocation.java
index 5295de35d56..b933f42ddb4 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/StorageLocation.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/StorageLocation.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/UserAccount.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/UserAccount.java
index d34bf839ba9..a184ea46791 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/UserAccount.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/UserAccount.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/jParmDBnode.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/jParmDBnode.java
index 1a258236e88..a82cf0c73db 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/jParmDBnode.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/jParmDBnode.java
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotDataAccessParmDBImpl.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotDataAccessParmDBImpl.java
index 73fe9289073..198360b0835 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotDataAccessParmDBImpl.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotDataAccessParmDBImpl.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotGroup.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotGroup.java
index 8d92d31f04d..61cf1a47bcd 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotGroup.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotGroup.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotGroupConfiguration.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotGroupConfiguration.java
index 7b8d39d99cb..ec7b0d73c75 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotGroupConfiguration.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotGroupConfiguration.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotGroupManager.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotGroupManager.java
index a7f2387caf8..0474f8bda62 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotGroupManager.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotGroupManager.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotSlot.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotSlot.java
index 9adf9a04380..40c8d318ae8 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotSlot.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotSlot.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotSlotListener.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotSlotListener.java
index 96fbc69f148..fc1e309968b 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotSlotListener.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotSlotListener.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotSlotManager.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotSlotManager.java
index 67a604ef0c8..a4e9e326786 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotSlotManager.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotSlotManager.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotSlotViewFrame.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotSlotViewFrame.java
index f9cd27cc073..72be636dbc6 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotSlotViewFrame.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotSlotViewFrame.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotSlotsPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotSlotsPanel.java
index 56225e56781..48ffea689f5 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotSlotsPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/plotter/PlotSlotsPanel.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/AnaBeamConfigurationTableModel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/AnaBeamConfigurationTableModel.java
index 456a0e44bb4..edb5c29528d 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/AnaBeamConfigurationTableModel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/AnaBeamConfigurationTableModel.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2010
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/BeamConfigurationTableModel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/BeamConfigurationTableModel.java
index 637c406b936..4fa4ee39cfc 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/BeamConfigurationTableModel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/BeamConfigurationTableModel.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/BeamformerConfigurationTableModel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/BeamformerConfigurationTableModel.java
index 0fdaa9cbde9..3d8fdb122cb 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/BeamformerConfigurationTableModel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/BeamformerConfigurationTableModel.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/ComponentTableModel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/ComponentTableModel.java
index bfa32636e2e..33302021475 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/ComponentTableModel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/ComponentTableModel.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/DefaultTemplatetableModel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/DefaultTemplatetableModel.java
index b0134ef1a0a..8214bc29d91 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/DefaultTemplatetableModel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/DefaultTemplatetableModel.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/InputNodeMACTableModel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/InputNodeMACTableModel.java
index 1a0d200d6a1..f48cb39849c 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/InputNodeMACTableModel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/InputNodeMACTableModel.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/LogParamTableModel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/LogParamTableModel.java
index ea5f871a912..8dea4c33f94 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/LogParamTableModel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/LogParamTableModel.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/MetadataTableModel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/MetadataTableModel.java
index 03ef8aaa893..be347c623b3 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/MetadataTableModel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/MetadataTableModel.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/PICtableModel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/PICtableModel.java
index 526f309b56a..eb02dadb7db 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/PICtableModel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/PICtableModel.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/ParamExtensionTableModel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/ParamExtensionTableModel.java
index 04b250b6cf6..268a004a3f2 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/ParamExtensionTableModel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/ParamExtensionTableModel.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/PencilConfigurationTableModel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/PencilConfigurationTableModel.java
index 057cd2c8370..eae98395df7 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/PencilConfigurationTableModel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/PencilConfigurationTableModel.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/RSPMACTableModel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/RSPMACTableModel.java
index 9a6f7c58685..22461bb48d0 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/RSPMACTableModel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/RSPMACTableModel.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/StateChangeHistoryTableModel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/StateChangeHistoryTableModel.java
index 09fd0b6b951..bbab68522da 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/StateChangeHistoryTableModel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/StateChangeHistoryTableModel.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/StationPositionsTableModel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/StationPositionsTableModel.java
index eaff7941e8c..efb40165298 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/StationPositionsTableModel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/StationPositionsTableModel.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/SubbandFreqTableModel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/SubbandFreqTableModel.java
index f89f516c779..a89aee04669 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/SubbandFreqTableModel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/SubbandFreqTableModel.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/TBBConfigurationTableModel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/TBBConfigurationTableModel.java
index 4a46bb748a5..95d06b46639 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/TBBConfigurationTableModel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/TBBConfigurationTableModel.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/TemplatetableModel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/TemplatetableModel.java
index a68b81b9f7c..580d964829a 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/TemplatetableModel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/TemplatetableModel.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/TiedArrayBeamConfigurationTableModel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/TiedArrayBeamConfigurationTableModel.java
index 38d659eedd4..cda14abc32c 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/TiedArrayBeamConfigurationTableModel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/tablemodels/TiedArrayBeamConfigurationTableModel.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2010
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/GenericTreeManager.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/GenericTreeManager.java
index 021d1453f07..cd98dc87f7d 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/GenericTreeManager.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/GenericTreeManager.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/ITreeManager.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/ITreeManager.java
index 51bdb26801f..642da22dc86 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/ITreeManager.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/ITreeManager.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/OTDBParamTreeManager.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/OTDBParamTreeManager.java
index dcc5316b687..cccdbe84bc7 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/OTDBParamTreeManager.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/OTDBParamTreeManager.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/ParmDBTreeManager.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/ParmDBTreeManager.java
index f3df191aac1..e80224247e7 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/ParmDBTreeManager.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/ParmDBTreeManager.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/ResultTreeManager.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/ResultTreeManager.java
index 75c3e2d4b6c..7debe0fdd42 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/ResultTreeManager.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/ResultTreeManager.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/TemplateTreeManager.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/TemplateTreeManager.java
index 5a9fa1078dd..34a323fa56b 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/TemplateTreeManager.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treemanagers/TemplateTreeManager.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treenodes/TreeNode.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treenodes/TreeNode.java
index c5c6e923de1..1f636a149ee 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treenodes/TreeNode.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otb/util/treenodes/TreeNode.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/AnaBeamDialog.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/AnaBeamDialog.java
index 7cdc6e7f97f..0b9150c6552 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/AnaBeamDialog.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/AnaBeamDialog.java
@@ -2,7 +2,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/BeamDialog.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/BeamDialog.java
index 60c7b3ddd62..cc136e2adc8 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/BeamDialog.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/BeamDialog.java
@@ -2,7 +2,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/BeamFileDialog.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/BeamFileDialog.java
index cce05850589..4a136e307a9 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/BeamFileDialog.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/BeamFileDialog.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ButtonPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ButtonPanel.java
index 7b3de11c2a1..94f63350f1e 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ButtonPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ButtonPanel.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/CampaignInfoDialog.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/CampaignInfoDialog.java
index 48292d8d8ad..ed065ab55e9 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/CampaignInfoDialog.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/CampaignInfoDialog.java
@@ -2,7 +2,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ComponentPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ComponentPanel.java
index b09f7c77590..3df05089f25 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ComponentPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ComponentPanel.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/CoordConversionDialog.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/CoordConversionDialog.java
index cdddb8c541e..fd09b00e0e8 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/CoordConversionDialog.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/CoordConversionDialog.java
@@ -2,7 +2,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/CreateDefaultTemplateDialog.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/CreateDefaultTemplateDialog.java
index c19b6155fff..25fe2e479b7 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/CreateDefaultTemplateDialog.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/CreateDefaultTemplateDialog.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ListDialog.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ListDialog.java
index 3a4d80404fc..a046bc233c9 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ListDialog.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ListDialog.java
@@ -2,7 +2,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ListPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ListPanel.java
index 1d18f7e5f29..e6ffc14cfbd 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ListPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ListPanel.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/LoadFileDialog.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/LoadFileDialog.java
index 1b535aee6bd..1c49b7f14af 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/LoadFileDialog.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/LoadFileDialog.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/LogParamPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/LogParamPanel.java
index 7506058ca58..49752a485e7 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/LogParamPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/LogParamPanel.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/LoginDialog.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/LoginDialog.java
index ede60c9e06f..58f6473dc57 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/LoginDialog.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/LoginDialog.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/MetadataDialog.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/MetadataDialog.java
index 0ed67833249..1c738ef9472 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/MetadataDialog.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/MetadataDialog.java
@@ -2,7 +2,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/MultiEditDialog.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/MultiEditDialog.java
index 3548258f48c..42f92a12184 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/MultiEditDialog.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/MultiEditDialog.java
@@ -2,7 +2,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/NodeViewPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/NodeViewPanel.java
index c11c3389939..cc92618a877 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/NodeViewPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/NodeViewPanel.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ParSetMetaViewPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ParSetMetaViewPanel.java
index badd9d073f8..5503c84f520 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ParSetMetaViewPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ParSetMetaViewPanel.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ParSetViewPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ParSetViewPanel.java
index 4117a31b257..a0134d653cf 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ParSetViewPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ParSetViewPanel.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ParamExtensionDialog.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ParamExtensionDialog.java
index b338925e885..3f9e74af258 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ParamExtensionDialog.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ParamExtensionDialog.java
@@ -2,7 +2,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ParameterViewPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ParameterViewPanel.java
index 01240a57910..b3cebbd2296 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ParameterViewPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ParameterViewPanel.java
@@ -1,7 +1,7 @@
 /*
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ParmDBConfigPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ParmDBConfigPanel.java
index 90e905ac2d9..feb0e1f42bb 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ParmDBConfigPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ParmDBConfigPanel.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ParmDBPlotPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ParmDBPlotPanel.java
index 163884c8456..64cf9eda421 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ParmDBPlotPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/ParmDBPlotPanel.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/PencilDialog.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/PencilDialog.java
index dd9e4cd552e..2160769d794 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/PencilDialog.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/PencilDialog.java
@@ -2,7 +2,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/SetServerDialog.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/SetServerDialog.java
index 1122a267a47..531b14109c5 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/SetServerDialog.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/SetServerDialog.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/StationSelectionPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/StationSelectionPanel.java
index 90e8b54dd2d..bcc0f2b2bc3 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/StationSelectionPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/StationSelectionPanel.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/StatusPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/StatusPanel.java
index 9b9eeeab077..abf35835f56 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/StatusPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/StatusPanel.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/StorageSelectionPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/StorageSelectionPanel.java
index b540652df8b..e291795455c 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/StorageSelectionPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/StorageSelectionPanel.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/TableDialog.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/TableDialog.java
index 1fd7c5dab46..768d56d097c 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/TableDialog.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/TableDialog.java
@@ -2,7 +2,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/TiedArrayBeamDialog.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/TiedArrayBeamDialog.java
index 92fb8392d68..77c82effa36 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/TiedArrayBeamDialog.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/TiedArrayBeamDialog.java
@@ -2,7 +2,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/TreeInfoDialog.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/TreeInfoDialog.java
index a73f7393c0b..8e33dee37dd 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/TreeInfoDialog.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/TreeInfoDialog.java
@@ -2,7 +2,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/TreePanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/TreePanel.java
index 9602ef3b52b..4d687af7e99 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/TreePanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/TreePanel.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/VICnodeDefViewPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/VICnodeDefViewPanel.java
index b6925af81fd..fd77188a04e 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/VICnodeDefViewPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/VICnodeDefViewPanel.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/VerticalButtonPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/VerticalButtonPanel.java
index 2a9621e84ef..7306f9f8efd 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/VerticalButtonPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/VerticalButtonPanel.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/BBSPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/BBSPanel.java
index dca180ef8df..3690a9868ba 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/BBSPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/BBSPanel.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/BBSStrategyPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/BBSStrategyPanel.java
index 67238db3231..f4e0215fe02 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/BBSStrategyPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/BBSStrategyPanel.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStep.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStep.java
index b44f04209ed..8900b9c326e 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStep.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStep.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStepData.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStepData.java
index 9dd917c5052..42eb4b04508 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStepData.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStepData.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStepDataManager.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStepDataManager.java
index 7228237e7ee..c41ce754ae3 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStepDataManager.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStepDataManager.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStepExplorerPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStepExplorerPanel.java
index 0d49e6b4802..c23c68756c0 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStepExplorerPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStepExplorerPanel.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStepInputDialog.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStepInputDialog.java
index 27d6faffe89..dc958cb2347 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStepInputDialog.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStepInputDialog.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStepNode.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStepNode.java
index 1628fed34a9..8f9cb584439 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStepNode.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStepNode.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStepTreeManager.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStepTreeManager.java
index 5acc4794172..4a2eeed1d70 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStepTreeManager.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStepTreeManager.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStrategy.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStrategy.java
index 5ecc2a3d03c..3e31eb8e3ad 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStrategy.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/BBSStrategy.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/operations/BBSStepOperationPanelSolveImpl.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/operations/BBSStepOperationPanelSolveImpl.java
index e395213199d..8ce181921e2 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/operations/BBSStepOperationPanelSolveImpl.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/operations/BBSStepOperationPanelSolveImpl.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/operations/IBBSStepOperationPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/operations/IBBSStepOperationPanel.java
index d568d1d3444..4b281cff247 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/operations/IBBSStepOperationPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/bbs/stepmanagement/operations/IBBSStepOperationPanel.java
@@ -3,7 +3,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/userpanels/CobaltPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/userpanels/CobaltPanel.java
index 6c679abdef8..810671d8ea2 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/userpanels/CobaltPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/userpanels/CobaltPanel.java
@@ -2,7 +2,7 @@
  * CobaltPanel.java
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/userpanels/ImagerPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/userpanels/ImagerPanel.java
index 06b604fb0af..c3c5cfcf421 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/userpanels/ImagerPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/userpanels/ImagerPanel.java
@@ -2,7 +2,7 @@
  * ImagerPanel.java
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/userpanels/ObservationPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/userpanels/ObservationPanel.java
index ca82a9a65cc..5719d0f8a07 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/userpanels/ObservationPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/userpanels/ObservationPanel.java
@@ -2,7 +2,7 @@
  * ObservationPanel.java
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/userpanels/TBBConfigPanel.java b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/userpanels/TBBConfigPanel.java
index fed7ed40457..5528a47b2a0 100644
--- a/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/userpanels/TBBConfigPanel.java
+++ b/SAS/OTB/OTB/src/nl/astron/lofar/sas/otbcomponents/userpanels/TBBConfigPanel.java
@@ -2,7 +2,7 @@
  * TBBConfigPanel.java
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/ControlPanel.java b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/ControlPanel.java
index 63947a441c5..bfa704f9600 100644
--- a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/ControlPanel.java
+++ b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/ControlPanel.java
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2006
  * ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/ITabPanel.java b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/ITabPanel.java
index a5ca8eddc69..2f8b22bee3e 100644
--- a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/ITabPanel.java
+++ b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/ITabPanel.java
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2006
  * ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/ListPanel.java b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/ListPanel.java
index 0bffe8b12b6..4380e0d32ed 100644
--- a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/ListPanel.java
+++ b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/ListPanel.java
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2006
  * ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/MainPanel.java b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/MainPanel.java
index 11b672422c0..0efba20cf6d 100644
--- a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/MainPanel.java
+++ b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/MainPanel.java
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2006
  * ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/MaskSelectionPanel.java b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/MaskSelectionPanel.java
index 361d7105af3..7da8cbbfd0d 100644
--- a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/MaskSelectionPanel.java
+++ b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/MaskSelectionPanel.java
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2006
  * ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/PlotContainer.java b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/PlotContainer.java
index 59345c7408e..3b10d617b2c 100644
--- a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/PlotContainer.java
+++ b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/PlotContainer.java
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2006
  * ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/PlotDataModel.java b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/PlotDataModel.java
index 4adddce285b..c61f3331f9d 100644
--- a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/PlotDataModel.java
+++ b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/PlotDataModel.java
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2006
  * ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/beamletstats/BeamletStatsPanel.java b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/beamletstats/BeamletStatsPanel.java
index 55139bcd370..2d80b2aaf4d 100644
--- a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/beamletstats/BeamletStatsPanel.java
+++ b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/beamletstats/BeamletStatsPanel.java
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2006
  * ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/control/RSPControlPanel.java b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/control/RSPControlPanel.java
index 894871acc98..61126842093 100644
--- a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/control/RSPControlPanel.java
+++ b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/control/RSPControlPanel.java
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2006
  * ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/ADOStatusPanel.java b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/ADOStatusPanel.java
index 65a1a15d181..1c1695f16a2 100644
--- a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/ADOStatusPanel.java
+++ b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/ADOStatusPanel.java
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2006
  * ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/DIAGStatusPanel.java b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/DIAGStatusPanel.java
index 1c3c0655b97..5a260ad0a0d 100644
--- a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/DIAGStatusPanel.java
+++ b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/DIAGStatusPanel.java
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2006
  * ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/ETHStatusPanel.java b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/ETHStatusPanel.java
index 3ae6aae133e..6175d896262 100644
--- a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/ETHStatusPanel.java
+++ b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/ETHStatusPanel.java
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2006
  * ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/MEPStatusPanel.java b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/MEPStatusPanel.java
index c677a47ef62..3fc52de3ac6 100644
--- a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/MEPStatusPanel.java
+++ b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/MEPStatusPanel.java
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2006
  * ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/RCUStatusPanel.java b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/RCUStatusPanel.java
index 4234a86ae6c..9baa1b26029 100644
--- a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/RCUStatusPanel.java
+++ b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/RCUStatusPanel.java
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2006
  * ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/RSPStatusPanel.java b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/RSPStatusPanel.java
index 79cfd3b36ba..e3eb3a2f5ea 100644
--- a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/RSPStatusPanel.java
+++ b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/RSPStatusPanel.java
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2006
  * ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/RSUStatusPanel.java b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/RSUStatusPanel.java
index f214b2b2b41..60ae617efcd 100644
--- a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/RSUStatusPanel.java
+++ b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/RSUStatusPanel.java
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2006
  * ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/StatusPanel.java b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/StatusPanel.java
index b99e9416b0b..98694e76893 100644
--- a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/StatusPanel.java
+++ b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/StatusPanel.java
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2006
  * ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/SyncStatusPanel.java b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/SyncStatusPanel.java
index 312b9ad569d..beaea547571 100644
--- a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/SyncStatusPanel.java
+++ b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/status/SyncStatusPanel.java
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2006
  * ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/subbandstats/SubbandStatsPanel.java b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/subbandstats/SubbandStatsPanel.java
index d93f88cb63d..ccff8d7c2c2 100644
--- a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/subbandstats/SubbandStatsPanel.java
+++ b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/subbandstats/SubbandStatsPanel.java
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2006
  * ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/subbandstats/SubbandStatsPlotPanel.java b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/subbandstats/SubbandStatsPlotPanel.java
index dc582032990..d1c2ded9ca7 100644
--- a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/subbandstats/SubbandStatsPlotPanel.java
+++ b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/subbandstats/SubbandStatsPlotPanel.java
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2006
  * ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/subbandstats/WaveformSettingsInputPanel.java b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/subbandstats/WaveformSettingsInputPanel.java
index 743fb1546bb..affa94e38af 100644
--- a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/subbandstats/WaveformSettingsInputPanel.java
+++ b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/subbandstats/WaveformSettingsInputPanel.java
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2006
  * ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/subbandstats/WaveformSettingsListPanel.java b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/subbandstats/WaveformSettingsListPanel.java
index 989f99da47f..0b6fe045284 100644
--- a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/subbandstats/WaveformSettingsListPanel.java
+++ b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/subbandstats/WaveformSettingsListPanel.java
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2006
  * ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/subbandstats/WaveformSettingsPanel.java b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/subbandstats/WaveformSettingsPanel.java
index 687d9a9dd51..8fbe33d4dac 100644
--- a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/subbandstats/WaveformSettingsPanel.java
+++ b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/subbandstats/WaveformSettingsPanel.java
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2006
  * ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/subbandstats/WaveformTableModel.java b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/subbandstats/WaveformTableModel.java
index c8b6aafe16c..a08cae0e416 100644
--- a/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/subbandstats/WaveformTableModel.java
+++ b/SAS/OTB/RSP/src/nl/astron/lofar/java/sas/otb/rsp/subbandstats/WaveformTableModel.java
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2006
  * ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/include/jOTDB3/nl_astron_lofar_sas_otb_jotdb3_jCommon.h b/SAS/OTB/jOTDB3/include/jOTDB3/nl_astron_lofar_sas_otb_jotdb3_jCommon.h
index 85e2d994285..ad7daefc1aa 100644
--- a/SAS/OTB/jOTDB3/include/jOTDB3/nl_astron_lofar_sas_otb_jotdb3_jCommon.h
+++ b/SAS/OTB/jOTDB3/include/jOTDB3/nl_astron_lofar_sas_otb_jotdb3_jCommon.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2005
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jCampaign.java b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jCampaign.java
index 098ad78b192..d44f211c3f1 100644
--- a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jCampaign.java
+++ b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jCampaign.java
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2010
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jCampaignInfo.java b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jCampaignInfo.java
index 7bf2121678f..6a77e6e50c8 100644
--- a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jCampaignInfo.java
+++ b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jCampaignInfo.java
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2010
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jCampaignInterface.java b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jCampaignInterface.java
index 90fa56b0aeb..3deaaff820c 100644
--- a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jCampaignInterface.java
+++ b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jCampaignInterface.java
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jClassifConv.java b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jClassifConv.java
index ea5da678274..ea8bc70cd8a 100644
--- a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jClassifConv.java
+++ b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jClassifConv.java
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jConverterInterface.java b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jConverterInterface.java
index e9f7c59ee80..be523e5193c 100644
--- a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jConverterInterface.java
+++ b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jConverterInterface.java
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jDefaultTemplate.java b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jDefaultTemplate.java
index 8138b984a7c..dbeb35698e0 100644
--- a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jDefaultTemplate.java
+++ b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jDefaultTemplate.java
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jInitCPPLogger.java b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jInitCPPLogger.java
index ea29dd7f936..397a698e126 100644
--- a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jInitCPPLogger.java
+++ b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jInitCPPLogger.java
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBaccess.java b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBaccess.java
index c8a3a83b5a1..60f661d3a1b 100644
--- a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBaccess.java
+++ b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBaccess.java
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBconnection.java b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBconnection.java
index c094316af36..b7bcc71d5c3 100644
--- a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBconnection.java
+++ b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBconnection.java
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBinterface.java b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBinterface.java
index 618b4dd5884..5d74ecb0cea 100644
--- a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBinterface.java
+++ b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBinterface.java
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBnode.java b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBnode.java
index 1bacd7c92fd..13e88a5c972 100644
--- a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBnode.java
+++ b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBnode.java
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBparam.java b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBparam.java
index b2c710894bc..1cfa5f7fc2b 100644
--- a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBparam.java
+++ b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBparam.java
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBserver.java b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBserver.java
index 4832d9facd8..8a04c189bad 100644
--- a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBserver.java
+++ b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBserver.java
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBtree.java b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBtree.java
index bef05619f00..df89585fb0c 100644
--- a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBtree.java
+++ b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBtree.java
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBvalue.java b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBvalue.java
index 9c0d6bc790c..d0a111e7dba 100644
--- a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBvalue.java
+++ b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jOTDBvalue.java
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jParamTypeConv.java b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jParamTypeConv.java
index aaeecab06ef..0df8fb2e797 100644
--- a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jParamTypeConv.java
+++ b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jParamTypeConv.java
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jTreeMaintenance.java b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jTreeMaintenance.java
index ffd289b6f90..2180049fd38 100644
--- a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jTreeMaintenance.java
+++ b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jTreeMaintenance.java
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jTreeMaintenanceInterface.java b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jTreeMaintenanceInterface.java
index f9aa436e634..82b55257dbc 100644
--- a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jTreeMaintenanceInterface.java
+++ b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jTreeMaintenanceInterface.java
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jTreeState.java b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jTreeState.java
index 7e626667267..876e911a946 100644
--- a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jTreeState.java
+++ b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jTreeState.java
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jTreeStateConv.java b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jTreeStateConv.java
index 114a6dba443..4e9fb132a0f 100644
--- a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jTreeStateConv.java
+++ b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jTreeStateConv.java
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jTreeTypeConv.java b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jTreeTypeConv.java
index fe5fccb2d94..870ea7409f8 100644
--- a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jTreeTypeConv.java
+++ b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jTreeTypeConv.java
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jTreeValue.java b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jTreeValue.java
index 52e47272bea..556aa090324 100644
--- a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jTreeValue.java
+++ b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jTreeValue.java
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jTreeValueInterface.java b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jTreeValueInterface.java
index 43cf15a83b2..ad68de1580d 100644
--- a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jTreeValueInterface.java
+++ b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jTreeValueInterface.java
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jUnitConv.java b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jUnitConv.java
index 97a06a0586e..c16106d4c09 100644
--- a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jUnitConv.java
+++ b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jUnitConv.java
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jVICnodeDef.java b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jVICnodeDef.java
index c4dd83cf9fc..bafbe58ded5 100644
--- a/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jVICnodeDef.java
+++ b/SAS/OTB/jOTDB3/src/nl/astron/lofar/sas/otb/jotdb3/jVICnodeDef.java
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jCampaign.cc b/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jCampaign.cc
index dde35e40e6f..2e18aa7f5c9 100644
--- a/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jCampaign.cc
+++ b/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jCampaign.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2005
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jClassifConv.cc b/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jClassifConv.cc
index 23ccf516a7a..5c32dfa3dc7 100644
--- a/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jClassifConv.cc
+++ b/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jClassifConv.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2005
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jCommon.cc b/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jCommon.cc
index aa24f69d4a9..b55cbeff3c5 100644
--- a/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jCommon.cc
+++ b/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jCommon.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jInitCPPLogger.cc b/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jInitCPPLogger.cc
index 98aba37b3f2..99ba5e03edb 100644
--- a/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jInitCPPLogger.cc
+++ b/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jInitCPPLogger.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2006
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jOTDBconnection.cc b/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jOTDBconnection.cc
index 61b3c3f6472..54f6c30acf5 100644
--- a/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jOTDBconnection.cc
+++ b/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jOTDBconnection.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jParamTypeConv.cc b/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jParamTypeConv.cc
index 2d8f471d65b..b596af845a6 100644
--- a/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jParamTypeConv.cc
+++ b/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jParamTypeConv.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance.cc b/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance.cc
index 1409abe6303..76cb955fd31 100644
--- a/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance.cc
+++ b/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jTreeMaintenance.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2005
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jTreeStateConv.cc b/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jTreeStateConv.cc
index 56ed5cbfea7..df27517226e 100644
--- a/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jTreeStateConv.cc
+++ b/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jTreeStateConv.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2005
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jTreeTypeConv.cc b/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jTreeTypeConv.cc
index 0539b7bd79f..c1585ff892d 100644
--- a/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jTreeTypeConv.cc
+++ b/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jTreeTypeConv.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jTreeValue.cc b/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jTreeValue.cc
index 11e8baa6e89..d11c712b62e 100644
--- a/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jTreeValue.cc
+++ b/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jTreeValue.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jUnitConv.cc b/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jUnitConv.cc
index a28d3db79d4..1cd62a839b5 100644
--- a/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jUnitConv.cc
+++ b/SAS/OTB/jOTDB3/src/nl_astron_lofar_sas_otb_jotdb3_jUnitConv.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jParmFacade/conf/Plotter-config-jparmfacade.jar b/SAS/OTB/jParmFacade/conf/Plotter-config-jparmfacade.jar
index 5e32dffb0d76e4afa412fe7288be5f283c3967d6..f1572f5486110132ca21f98df94a5c125ca59574 100644
GIT binary patch
delta 27
icmeAdnk}>;gNZLct)x7$D7Cn>pdi1fWOEkNQZ@jM_zG44

delta 15
WcmbO&)GxFlgNZ3MeRCPpQZ@i7*98p#

diff --git a/SAS/OTB/jParmFacade/src/nl/astron/lofar/sas/otb/jparmfacade/jParmFacade.java b/SAS/OTB/jParmFacade/src/nl/astron/lofar/sas/otb/jparmfacade/jParmFacade.java
index 8bd4b078175..65ac554c926 100644
--- a/SAS/OTB/jParmFacade/src/nl/astron/lofar/sas/otb/jparmfacade/jParmFacade.java
+++ b/SAS/OTB/jParmFacade/src/nl/astron/lofar/sas/otb/jparmfacade/jParmFacade.java
@@ -2,7 +2,7 @@
  *
  *  Copyright (C) 2002-2007
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jParmFacade/src/nl/astron/lofar/sas/otb/jparmfacade/jParmFacadeAdapter.java b/SAS/OTB/jParmFacade/src/nl/astron/lofar/sas/otb/jparmfacade/jParmFacadeAdapter.java
index e07ff4eeed6..4958ea7ac4c 100644
--- a/SAS/OTB/jParmFacade/src/nl/astron/lofar/sas/otb/jparmfacade/jParmFacadeAdapter.java
+++ b/SAS/OTB/jParmFacade/src/nl/astron/lofar/sas/otb/jparmfacade/jParmFacadeAdapter.java
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jParmFacade/src/nl/astron/lofar/sas/otb/jparmfacade/jParmFacadeInterface.java b/SAS/OTB/jParmFacade/src/nl/astron/lofar/sas/otb/jparmfacade/jParmFacadeInterface.java
index 4df6058ba9f..1bc403d1295 100644
--- a/SAS/OTB/jParmFacade/src/nl/astron/lofar/sas/otb/jparmfacade/jParmFacadeInterface.java
+++ b/SAS/OTB/jParmFacade/src/nl/astron/lofar/sas/otb/jparmfacade/jParmFacadeInterface.java
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jParmFacade/src/nl/astron/lofar/sas/otb/jparmfacade/jParmFacadeServer.java b/SAS/OTB/jParmFacade/src/nl/astron/lofar/sas/otb/jparmfacade/jParmFacadeServer.java
index 2821229e900..ece35f19c23 100644
--- a/SAS/OTB/jParmFacade/src/nl/astron/lofar/sas/otb/jparmfacade/jParmFacadeServer.java
+++ b/SAS/OTB/jParmFacade/src/nl/astron/lofar/sas/otb/jparmfacade/jParmFacadeServer.java
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jParmFacade/src/nl_astron_lofar_otb_jparmfacade_jParmFacade.cc b/SAS/OTB/jParmFacade/src/nl_astron_lofar_otb_jparmfacade_jParmFacade.cc
index dbafddcd7a0..2856cc85c5e 100644
--- a/SAS/OTB/jParmFacade/src/nl_astron_lofar_otb_jparmfacade_jParmFacade.cc
+++ b/SAS/OTB/jParmFacade/src/nl_astron_lofar_otb_jparmfacade_jParmFacade.cc
@@ -3,7 +3,7 @@
 //#
 //#  Copyright (C) 2005-2007
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jParmFacade/test/nl/astron/lofar/sas/otb/jparmfacade/test/tParmFacade.java b/SAS/OTB/jParmFacade/test/nl/astron/lofar/sas/otb/jparmfacade/test/tParmFacade.java
index bdadb58f463..f85d40f752a 100644
--- a/SAS/OTB/jParmFacade/test/nl/astron/lofar/sas/otb/jparmfacade/test/tParmFacade.java
+++ b/SAS/OTB/jParmFacade/test/nl/astron/lofar/sas/otb/jparmfacade/test/tParmFacade.java
@@ -6,7 +6,7 @@ package nl.astron.lofar.sas.otb.jparmfacade.test;
  *
  * Copyright (C) 2006
  * ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jParmFacade/test/nl/astron/lofar/sas/otb/jparmfacade/test/tRemoteParmFacade.java b/SAS/OTB/jParmFacade/test/nl/astron/lofar/sas/otb/jparmfacade/test/tRemoteParmFacade.java
index 081c036569f..e10eccf9c89 100644
--- a/SAS/OTB/jParmFacade/test/nl/astron/lofar/sas/otb/jparmfacade/test/tRemoteParmFacade.java
+++ b/SAS/OTB/jParmFacade/test/nl/astron/lofar/sas/otb/jparmfacade/test/tRemoteParmFacade.java
@@ -6,7 +6,7 @@ package nl.astron.lofar.sas.otb.jparmfacade.test;
  *
  * Copyright (C) 2006
  * ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/ADOStatus.java b/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/ADOStatus.java
index 7b6443e411b..d287318bfd2 100644
--- a/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/ADOStatus.java
+++ b/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/ADOStatus.java
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2006
  * ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/Board.java b/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/Board.java
index 146b0b5106b..0cc1d761016 100644
--- a/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/Board.java
+++ b/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/Board.java
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2006
  * ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/BoardStatus.java b/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/BoardStatus.java
index b1def5cf512..1af57bf6426 100644
--- a/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/BoardStatus.java
+++ b/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/BoardStatus.java
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2006
  * ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/IMask.java b/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/IMask.java
index c756d05947e..a24a8774b35 100644
--- a/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/IMask.java
+++ b/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/IMask.java
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2006
  * ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/RCUMask.java b/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/RCUMask.java
index 832952f0588..9cf8b075023 100644
--- a/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/RCUMask.java
+++ b/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/RCUMask.java
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2006
  * ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/RCUStatus.java b/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/RCUStatus.java
index ba812ed5ccf..e868eaa5bc5 100644
--- a/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/RCUStatus.java
+++ b/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/RCUStatus.java
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2006
  * ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/RSPMask.java b/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/RSPMask.java
index c193faba415..7f11fa83876 100644
--- a/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/RSPMask.java
+++ b/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/RSPMask.java
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2006
  * ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/SyncStatus.java b/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/SyncStatus.java
index bad400251b4..bf16334ea0b 100644
--- a/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/SyncStatus.java
+++ b/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/SyncStatus.java
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2006
  * ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/WGRegisterType.java b/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/WGRegisterType.java
index 56b357c9c5c..f19c5fa0370 100644
--- a/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/WGRegisterType.java
+++ b/SAS/OTB/jRSP/src/nl/astron/lofar/sas/otb/jrsp/WGRegisterType.java
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2006
  * ASTRON (Netherlands Foundation for Research in Astronomy)
- * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ * P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/include/OTDB/Campaign.h b/SAS/OTDB/include/OTDB/Campaign.h
index 657e629dfca..23fe68717a2 100644
--- a/SAS/OTDB/include/OTDB/Campaign.h
+++ b/SAS/OTDB/include/OTDB/Campaign.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2010
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/include/OTDB/CampaignInfo.h b/SAS/OTDB/include/OTDB/CampaignInfo.h
index 05e849699a2..13a134ef991 100644
--- a/SAS/OTDB/include/OTDB/CampaignInfo.h
+++ b/SAS/OTDB/include/OTDB/CampaignInfo.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2010
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/include/OTDB/ClassifConv.h b/SAS/OTDB/include/OTDB/ClassifConv.h
index a7600876fc6..56e7fddb7ef 100644
--- a/SAS/OTDB/include/OTDB/ClassifConv.h
+++ b/SAS/OTDB/include/OTDB/ClassifConv.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/include/OTDB/Converter.h b/SAS/OTDB/include/OTDB/Converter.h
index 74240d53534..66a233369fe 100644
--- a/SAS/OTDB/include/OTDB/Converter.h
+++ b/SAS/OTDB/include/OTDB/Converter.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/include/OTDB/DefaultTemplate.h b/SAS/OTDB/include/OTDB/DefaultTemplate.h
index 47ebe27cb69..5efa62bae8b 100644
--- a/SAS/OTDB/include/OTDB/DefaultTemplate.h
+++ b/SAS/OTDB/include/OTDB/DefaultTemplate.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/include/OTDB/OTDBaction.h b/SAS/OTDB/include/OTDB/OTDBaction.h
index be62bea0b9a..976d59012a2 100644
--- a/SAS/OTDB/include/OTDB/OTDBaction.h
+++ b/SAS/OTDB/include/OTDB/OTDBaction.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/include/OTDB/OTDBactionList.h b/SAS/OTDB/include/OTDB/OTDBactionList.h
index c067e8f5e0d..14f27e32b3d 100644
--- a/SAS/OTDB/include/OTDB/OTDBactionList.h
+++ b/SAS/OTDB/include/OTDB/OTDBactionList.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/include/OTDB/OTDBconnection.h b/SAS/OTDB/include/OTDB/OTDBconnection.h
index 52a4fc2b7cb..f47b0e6c3d4 100644
--- a/SAS/OTDB/include/OTDB/OTDBconnection.h
+++ b/SAS/OTDB/include/OTDB/OTDBconnection.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/include/OTDB/OTDBconstants.h b/SAS/OTDB/include/OTDB/OTDBconstants.h
index 781cde5538e..2ef08e5ce8a 100644
--- a/SAS/OTDB/include/OTDB/OTDBconstants.h
+++ b/SAS/OTDB/include/OTDB/OTDBconstants.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/include/OTDB/OTDBcontrol.h b/SAS/OTDB/include/OTDB/OTDBcontrol.h
index 30bf05e693a..b820e50eb93 100644
--- a/SAS/OTDB/include/OTDB/OTDBcontrol.h
+++ b/SAS/OTDB/include/OTDB/OTDBcontrol.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/include/OTDB/OTDBevent.h b/SAS/OTDB/include/OTDB/OTDBevent.h
index 270a4ee5813..019e815c857 100644
--- a/SAS/OTDB/include/OTDB/OTDBevent.h
+++ b/SAS/OTDB/include/OTDB/OTDBevent.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/include/OTDB/OTDBeventList.h b/SAS/OTDB/include/OTDB/OTDBeventList.h
index ea8968cae8b..baf06a52e42 100644
--- a/SAS/OTDB/include/OTDB/OTDBeventList.h
+++ b/SAS/OTDB/include/OTDB/OTDBeventList.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/include/OTDB/OTDBnode.h b/SAS/OTDB/include/OTDB/OTDBnode.h
index 1985bf1c8ac..6a351dd5b0a 100644
--- a/SAS/OTDB/include/OTDB/OTDBnode.h
+++ b/SAS/OTDB/include/OTDB/OTDBnode.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/include/OTDB/OTDBparam.h b/SAS/OTDB/include/OTDB/OTDBparam.h
index b5a403bec80..d2f4ca86c47 100644
--- a/SAS/OTDB/include/OTDB/OTDBparam.h
+++ b/SAS/OTDB/include/OTDB/OTDBparam.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/include/OTDB/OTDBtree.h b/SAS/OTDB/include/OTDB/OTDBtree.h
index c8f846cc847..ff39e7e4489 100644
--- a/SAS/OTDB/include/OTDB/OTDBtree.h
+++ b/SAS/OTDB/include/OTDB/OTDBtree.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/include/OTDB/OTDBtypes.h b/SAS/OTDB/include/OTDB/OTDBtypes.h
index 501a67f53ab..48fa0161e9c 100644
--- a/SAS/OTDB/include/OTDB/OTDBtypes.h
+++ b/SAS/OTDB/include/OTDB/OTDBtypes.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/include/OTDB/OTDBvalue.h b/SAS/OTDB/include/OTDB/OTDBvalue.h
index 885e3436ac4..79bdbc151e0 100644
--- a/SAS/OTDB/include/OTDB/OTDBvalue.h
+++ b/SAS/OTDB/include/OTDB/OTDBvalue.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/include/OTDB/ParamTypeConv.h b/SAS/OTDB/include/OTDB/ParamTypeConv.h
index 2b600196f45..38c182b5001 100644
--- a/SAS/OTDB/include/OTDB/ParamTypeConv.h
+++ b/SAS/OTDB/include/OTDB/ParamTypeConv.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/include/OTDB/TreeMaintenance.h b/SAS/OTDB/include/OTDB/TreeMaintenance.h
index 30d01030bf4..e1d0c80ff1f 100644
--- a/SAS/OTDB/include/OTDB/TreeMaintenance.h
+++ b/SAS/OTDB/include/OTDB/TreeMaintenance.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/include/OTDB/TreeState.h b/SAS/OTDB/include/OTDB/TreeState.h
index 212f11af7fb..3e74248729c 100644
--- a/SAS/OTDB/include/OTDB/TreeState.h
+++ b/SAS/OTDB/include/OTDB/TreeState.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/include/OTDB/TreeStateConv.h b/SAS/OTDB/include/OTDB/TreeStateConv.h
index 4314b131a07..7da3d7ae2f6 100644
--- a/SAS/OTDB/include/OTDB/TreeStateConv.h
+++ b/SAS/OTDB/include/OTDB/TreeStateConv.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/include/OTDB/TreeTypeConv.h b/SAS/OTDB/include/OTDB/TreeTypeConv.h
index 5900a3eaeca..f99e69daf0c 100644
--- a/SAS/OTDB/include/OTDB/TreeTypeConv.h
+++ b/SAS/OTDB/include/OTDB/TreeTypeConv.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/include/OTDB/TreeValue.h b/SAS/OTDB/include/OTDB/TreeValue.h
index b4a8fee96f1..f394fe63c1e 100644
--- a/SAS/OTDB/include/OTDB/TreeValue.h
+++ b/SAS/OTDB/include/OTDB/TreeValue.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/include/OTDB/UnitConv.h b/SAS/OTDB/include/OTDB/UnitConv.h
index 377775495ff..af31e0f45ff 100644
--- a/SAS/OTDB/include/OTDB/UnitConv.h
+++ b/SAS/OTDB/include/OTDB/UnitConv.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/include/OTDB/VICnodeDef.h b/SAS/OTDB/include/OTDB/VICnodeDef.h
index 9b0cf656b64..6a815a9402e 100644
--- a/SAS/OTDB/include/OTDB/VICnodeDef.h
+++ b/SAS/OTDB/include/OTDB/VICnodeDef.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/include/OTDB/misc.h b/SAS/OTDB/include/OTDB/misc.h
index f1c42693875..b0381dbf0a5 100644
--- a/SAS/OTDB/include/OTDB/misc.h
+++ b/SAS/OTDB/include/OTDB/misc.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/include/OTDB/wSpaceSplit.h b/SAS/OTDB/include/OTDB/wSpaceSplit.h
index fcb40efbe0e..d0ba6e179e5 100644
--- a/SAS/OTDB/include/OTDB/wSpaceSplit.h
+++ b/SAS/OTDB/include/OTDB/wSpaceSplit.h
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/addComponentToVT_func.sql b/SAS/OTDB/sql/addComponentToVT_func.sql
index 18d947d140c..4a982fff4e3 100644
--- a/SAS/OTDB/sql/addComponentToVT_func.sql
+++ b/SAS/OTDB/sql/addComponentToVT_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2005
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/addKVT_func.sql b/SAS/OTDB/sql/addKVT_func.sql
index 30e1bf83707..9e38f06c5d4 100644
--- a/SAS/OTDB/sql/addKVT_func.sql
+++ b/SAS/OTDB/sql/addKVT_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2005
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/addPICparam_func.sql b/SAS/OTDB/sql/addPICparam_func.sql
index 8c3d019c02f..c826879bb41 100644
--- a/SAS/OTDB/sql/addPICparam_func.sql
+++ b/SAS/OTDB/sql/addPICparam_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2005
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/addTreeState_func.sql b/SAS/OTDB/sql/addTreeState_func.sql
index 0962f9bb1e2..4ada8a77b11 100644
--- a/SAS/OTDB/sql/addTreeState_func.sql
+++ b/SAS/OTDB/sql/addTreeState_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2005
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/assignProcessType_func.sql b/SAS/OTDB/sql/assignProcessType_func.sql
index 5e7fa8831df..3687a84bbf3 100644
--- a/SAS/OTDB/sql/assignProcessType_func.sql
+++ b/SAS/OTDB/sql/assignProcessType_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2011
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/buildTemplateTree_func.sql b/SAS/OTDB/sql/buildTemplateTree_func.sql
index 93dd697172e..bfc9a1b4b59 100644
--- a/SAS/OTDB/sql/buildTemplateTree_func.sql
+++ b/SAS/OTDB/sql/buildTemplateTree_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2005
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/campaignAPI.sql b/SAS/OTDB/sql/campaignAPI.sql
index 4db18fc2412..7611bbf10f3 100644
--- a/SAS/OTDB/sql/campaignAPI.sql
+++ b/SAS/OTDB/sql/campaignAPI.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2010
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/classify_func.sql b/SAS/OTDB/sql/classify_func.sql
index f409354f155..209248c70f8 100644
--- a/SAS/OTDB/sql/classify_func.sql
+++ b/SAS/OTDB/sql/classify_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2005
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/copyTree_func.sql b/SAS/OTDB/sql/copyTree_func.sql
index 1a1a5eba896..66015bb0817 100644
--- a/SAS/OTDB/sql/copyTree_func.sql
+++ b/SAS/OTDB/sql/copyTree_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2005
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/copyVHtree_func.sql b/SAS/OTDB/sql/copyVHtree_func.sql
index c9fefab06de..ea003f7bcec 100644
--- a/SAS/OTDB/sql/copyVHtree_func.sql
+++ b/SAS/OTDB/sql/copyVHtree_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2005
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/copyVTtree_func.sql b/SAS/OTDB/sql/copyVTtree_func.sql
index 5713219f3d7..2f903e64a6c 100644
--- a/SAS/OTDB/sql/copyVTtree_func.sql
+++ b/SAS/OTDB/sql/copyVTtree_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2005
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/create_PIC_tables.sql b/SAS/OTDB/sql/create_PIC_tables.sql
index 409d9672193..732edb89e4f 100644
--- a/SAS/OTDB/sql/create_PIC_tables.sql
+++ b/SAS/OTDB/sql/create_PIC_tables.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2005
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/create_VIC_tables.sql b/SAS/OTDB/sql/create_VIC_tables.sql
index edc6143f982..b0267841271 100644
--- a/SAS/OTDB/sql/create_VIC_tables.sql
+++ b/SAS/OTDB/sql/create_VIC_tables.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2005
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/create_base_tables.sql b/SAS/OTDB/sql/create_base_tables.sql
index 4aaa49f053a..ffdd1597423 100644
--- a/SAS/OTDB/sql/create_base_tables.sql
+++ b/SAS/OTDB/sql/create_base_tables.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2005
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/create_event_action.sql b/SAS/OTDB/sql/create_event_action.sql
index 9477106657e..1d1b2ec324f 100644
--- a/SAS/OTDB/sql/create_event_action.sql
+++ b/SAS/OTDB/sql/create_event_action.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2005
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/create_log_system.sql b/SAS/OTDB/sql/create_log_system.sql
index 70cc90478cb..89737bc54fb 100644
--- a/SAS/OTDB/sql/create_log_system.sql
+++ b/SAS/OTDB/sql/create_log_system.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2005
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/create_rules.sql b/SAS/OTDB/sql/create_rules.sql
index e3888ca23e0..6b6ca997709 100644
--- a/SAS/OTDB/sql/create_rules.sql
+++ b/SAS/OTDB/sql/create_rules.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2012
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/create_security.sql b/SAS/OTDB/sql/create_security.sql
index eeeb0ad8c9f..03b22168cd1 100644
--- a/SAS/OTDB/sql/create_security.sql
+++ b/SAS/OTDB/sql/create_security.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2005
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/create_tree_table.sql b/SAS/OTDB/sql/create_tree_table.sql
index 90ffbbf53a2..cd314a101bc 100644
--- a/SAS/OTDB/sql/create_tree_table.sql
+++ b/SAS/OTDB/sql/create_tree_table.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2005
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/create_types.sql b/SAS/OTDB/sql/create_types.sql
index 92730d73c18..049eded2fd9 100644
--- a/SAS/OTDB/sql/create_types.sql
+++ b/SAS/OTDB/sql/create_types.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2005
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/deleteTree_func.sql b/SAS/OTDB/sql/deleteTree_func.sql
index c66cd2d44d1..0068a4c91c6 100644
--- a/SAS/OTDB/sql/deleteTree_func.sql
+++ b/SAS/OTDB/sql/deleteTree_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2005
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/deleteVCnode_func.sql b/SAS/OTDB/sql/deleteVCnode_func.sql
index 66e30f06fd8..9f4fd433de4 100644
--- a/SAS/OTDB/sql/deleteVCnode_func.sql
+++ b/SAS/OTDB/sql/deleteVCnode_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2005
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/deleteVTnode_func.sql b/SAS/OTDB/sql/deleteVTnode_func.sql
index 9cdeb895f1e..81d4c7aa0e8 100644
--- a/SAS/OTDB/sql/deleteVTnode_func.sql
+++ b/SAS/OTDB/sql/deleteVTnode_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2005
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/dupVTnode_func.sql b/SAS/OTDB/sql/dupVTnode_func.sql
index c06e89342e3..60cf069df75 100644
--- a/SAS/OTDB/sql/dupVTnode_func.sql
+++ b/SAS/OTDB/sql/dupVTnode_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2005
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/exportMetadata_func.sql b/SAS/OTDB/sql/exportMetadata_func.sql
index 49c51727cbf..a9a9e4b222a 100644
--- a/SAS/OTDB/sql/exportMetadata_func.sql
+++ b/SAS/OTDB/sql/exportMetadata_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2013
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/exportResultTree_func.sql b/SAS/OTDB/sql/exportResultTree_func.sql
index 4bdf45db1be..bc031f2333c 100644
--- a/SAS/OTDB/sql/exportResultTree_func.sql
+++ b/SAS/OTDB/sql/exportResultTree_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2005
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/exportTree_func.sql b/SAS/OTDB/sql/exportTree_func.sql
index fde3d84133b..71a729345d6 100644
--- a/SAS/OTDB/sql/exportTree_func.sql
+++ b/SAS/OTDB/sql/exportTree_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2005
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/getAllTaskID_func.sql b/SAS/OTDB/sql/getAllTaskID_func.sql
index 22f13b4847a..3587d015b2d 100644
--- a/SAS/OTDB/sql/getAllTaskID_func.sql
+++ b/SAS/OTDB/sql/getAllTaskID_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2010
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/getBrokenHardware_func.sql b/SAS/OTDB/sql/getBrokenHardware_func.sql
index 7112549dbea..ed6bcd14da5 100644
--- a/SAS/OTDB/sql/getBrokenHardware_func.sql
+++ b/SAS/OTDB/sql/getBrokenHardware_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2011
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/getDefaultTemplates_func.sql b/SAS/OTDB/sql/getDefaultTemplates_func.sql
index 0bc0bf84d52..cba5df5f1ff 100644
--- a/SAS/OTDB/sql/getDefaultTemplates_func.sql
+++ b/SAS/OTDB/sql/getDefaultTemplates_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2005
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/getExecutableTrees_func.sql b/SAS/OTDB/sql/getExecutableTrees_func.sql
index 027c50ee576..dca6b9ab52f 100644
--- a/SAS/OTDB/sql/getExecutableTrees_func.sql
+++ b/SAS/OTDB/sql/getExecutableTrees_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2005
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/getModifiedTrees_func.sql b/SAS/OTDB/sql/getModifiedTrees_func.sql
index 259226e90b9..b7c1da39f14 100644
--- a/SAS/OTDB/sql/getModifiedTrees_func.sql
+++ b/SAS/OTDB/sql/getModifiedTrees_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2012
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/getMomID2treeID_func.sql b/SAS/OTDB/sql/getMomID2treeID_func.sql
index decc5d1b700..b8fdc492228 100644
--- a/SAS/OTDB/sql/getMomID2treeID_func.sql
+++ b/SAS/OTDB/sql/getMomID2treeID_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2012
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/getNode_func.sql b/SAS/OTDB/sql/getNode_func.sql
index 85162cee365..505bcde0be1 100644
--- a/SAS/OTDB/sql/getNode_func.sql
+++ b/SAS/OTDB/sql/getNode_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2005
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/getPICitemList_func.sql b/SAS/OTDB/sql/getPICitemList_func.sql
index de59fdcfc6b..71b8f960844 100644
--- a/SAS/OTDB/sql/getPICitemList_func.sql
+++ b/SAS/OTDB/sql/getPICitemList_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2005
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/getPICparamDef_func.sql b/SAS/OTDB/sql/getPICparamDef_func.sql
index 3af44c4432c..39d2bcf71c2 100644
--- a/SAS/OTDB/sql/getPICparamDef_func.sql
+++ b/SAS/OTDB/sql/getPICparamDef_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2005
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/getSchedulerInfo_func.sql b/SAS/OTDB/sql/getSchedulerInfo_func.sql
index afe05f8c336..eacfccf193e 100644
--- a/SAS/OTDB/sql/getSchedulerInfo_func.sql
+++ b/SAS/OTDB/sql/getSchedulerInfo_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2010
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/getStateList_func.sql b/SAS/OTDB/sql/getStateList_func.sql
index 1d96d64a6cd..7296f028cbc 100644
--- a/SAS/OTDB/sql/getStateList_func.sql
+++ b/SAS/OTDB/sql/getStateList_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2005
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/getTopNode_func.sql b/SAS/OTDB/sql/getTopNode_func.sql
index 3056ce01d9e..2b318c8ffe0 100644
--- a/SAS/OTDB/sql/getTopNode_func.sql
+++ b/SAS/OTDB/sql/getTopNode_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2005
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/getTreeGroup_func.sql b/SAS/OTDB/sql/getTreeGroup_func.sql
index 4e32f1f8c09..013d505bae4 100644
--- a/SAS/OTDB/sql/getTreeGroup_func.sql
+++ b/SAS/OTDB/sql/getTreeGroup_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2005
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/getTreeInfo_func.sql b/SAS/OTDB/sql/getTreeInfo_func.sql
index 1ce3214ef39..962ace7a177 100644
--- a/SAS/OTDB/sql/getTreeInfo_func.sql
+++ b/SAS/OTDB/sql/getTreeInfo_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2005
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/getTreeList_func.sql b/SAS/OTDB/sql/getTreeList_func.sql
index 5ead542cab7..22cb9094cfe 100644
--- a/SAS/OTDB/sql/getTreeList_func.sql
+++ b/SAS/OTDB/sql/getTreeList_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2005
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/getTreesInPeriod_func.sql b/SAS/OTDB/sql/getTreesInPeriod_func.sql
index d071a34bec5..8476ec10651 100644
--- a/SAS/OTDB/sql/getTreesInPeriod_func.sql
+++ b/SAS/OTDB/sql/getTreesInPeriod_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2005
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/getVCNodeList_func.sql b/SAS/OTDB/sql/getVCNodeList_func.sql
index 6ac239f0205..8bda0a63061 100644
--- a/SAS/OTDB/sql/getVCNodeList_func.sql
+++ b/SAS/OTDB/sql/getVCNodeList_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2005
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/getVCparams_func.sql b/SAS/OTDB/sql/getVCparams_func.sql
index 29c4ae5283b..1aba8c09181 100644
--- a/SAS/OTDB/sql/getVCparams_func.sql
+++ b/SAS/OTDB/sql/getVCparams_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2005
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/getVHitemList_func.sql b/SAS/OTDB/sql/getVHitemList_func.sql
index a3afc890593..980e3f0e821 100644
--- a/SAS/OTDB/sql/getVHitemList_func.sql
+++ b/SAS/OTDB/sql/getVHitemList_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2005
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/getVICnodeDef_func.sql b/SAS/OTDB/sql/getVICnodeDef_func.sql
index ca012acfcd7..a825eaff05b 100644
--- a/SAS/OTDB/sql/getVICnodeDef_func.sql
+++ b/SAS/OTDB/sql/getVICnodeDef_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2005
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/getVICparamDef_func.sql b/SAS/OTDB/sql/getVICparamDef_func.sql
index 8ce28fd22f4..32f4ed51762 100644
--- a/SAS/OTDB/sql/getVICparamDef_func.sql
+++ b/SAS/OTDB/sql/getVICparamDef_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2005
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/getVTchildren_func.sql b/SAS/OTDB/sql/getVTchildren_func.sql
index 105017cb321..8fb5533d303 100644
--- a/SAS/OTDB/sql/getVTchildren_func.sql
+++ b/SAS/OTDB/sql/getVTchildren_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2005
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/getVTitemList_func.sql b/SAS/OTDB/sql/getVTitemList_func.sql
index 40637ec8891..b72dea44d21 100644
--- a/SAS/OTDB/sql/getVTitemList_func.sql
+++ b/SAS/OTDB/sql/getVTitemList_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2005
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/getVTitem_func.sql b/SAS/OTDB/sql/getVTitem_func.sql
index aa9e3b7b0a0..0c130cacee9 100644
--- a/SAS/OTDB/sql/getVTitem_func.sql
+++ b/SAS/OTDB/sql/getVTitem_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2011
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/hVICsearchParamID_func.sql b/SAS/OTDB/sql/hVICsearchParamID_func.sql
index adb7cce96f1..eff4692d54f 100644
--- a/SAS/OTDB/sql/hVICsearchParamID_func.sql
+++ b/SAS/OTDB/sql/hVICsearchParamID_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2005
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/instanciateTree_func.sql b/SAS/OTDB/sql/instanciateTree_func.sql
index 5da72dfb3ee..1b96e0900e7 100644
--- a/SAS/OTDB/sql/instanciateTree_func.sql
+++ b/SAS/OTDB/sql/instanciateTree_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2005
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/isTopComponent_func.sql b/SAS/OTDB/sql/isTopComponent_func.sql
index 78b086471a7..98e285f9a0b 100644
--- a/SAS/OTDB/sql/isTopComponent_func.sql
+++ b/SAS/OTDB/sql/isTopComponent_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2005
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/misc_func.sql b/SAS/OTDB/sql/misc_func.sql
index 453140a2268..9327c931293 100644
--- a/SAS/OTDB/sql/misc_func.sql
+++ b/SAS/OTDB/sql/misc_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2005
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/newTree_func.sql b/SAS/OTDB/sql/newTree_func.sql
index b0495585eeb..34cb74e94f2 100644
--- a/SAS/OTDB/sql/newTree_func.sql
+++ b/SAS/OTDB/sql/newTree_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2005
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/saveSchedulerInfo_func.sql b/SAS/OTDB/sql/saveSchedulerInfo_func.sql
index 26367abc81d..8fbd82dc047 100644
--- a/SAS/OTDB/sql/saveSchedulerInfo_func.sql
+++ b/SAS/OTDB/sql/saveSchedulerInfo_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2010
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/saveVCnode_func.sql b/SAS/OTDB/sql/saveVCnode_func.sql
index 63bbd27e833..730c6c0fb4c 100644
--- a/SAS/OTDB/sql/saveVCnode_func.sql
+++ b/SAS/OTDB/sql/saveVCnode_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2005
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/saveVICparamDef_func.sql b/SAS/OTDB/sql/saveVICparamDef_func.sql
index faf557cff7b..3484860b374 100644
--- a/SAS/OTDB/sql/saveVICparamDef_func.sql
+++ b/SAS/OTDB/sql/saveVICparamDef_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2005
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/searchPICinPeriod_func.sql b/SAS/OTDB/sql/searchPICinPeriod_func.sql
index 8fd0e44ed82..5862c655352 100644
--- a/SAS/OTDB/sql/searchPICinPeriod_func.sql
+++ b/SAS/OTDB/sql/searchPICinPeriod_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2005
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/searchVHinPeriod_func.sql b/SAS/OTDB/sql/searchVHinPeriod_func.sql
index cbbf4fbf2b0..fddde3c9a5b 100644
--- a/SAS/OTDB/sql/searchVHinPeriod_func.sql
+++ b/SAS/OTDB/sql/searchVHinPeriod_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2005
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/security_func.sql b/SAS/OTDB/sql/security_func.sql
index bfed36af51a..e6d0c2f94a2 100644
--- a/SAS/OTDB/sql/security_func.sql
+++ b/SAS/OTDB/sql/security_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2005
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/setDescription_func.sql b/SAS/OTDB/sql/setDescription_func.sql
index 2bbda61ffcf..387a7ac1210 100644
--- a/SAS/OTDB/sql/setDescription_func.sql
+++ b/SAS/OTDB/sql/setDescription_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2006
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/setMomInfo_func.sql b/SAS/OTDB/sql/setMomInfo_func.sql
index caaac5c1bf8..90b64fef1fd 100644
--- a/SAS/OTDB/sql/setMomInfo_func.sql
+++ b/SAS/OTDB/sql/setMomInfo_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2005
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/setSchedule_func.sql b/SAS/OTDB/sql/setSchedule_func.sql
index eb74f2d48b0..3598556ef25 100644
--- a/SAS/OTDB/sql/setSchedule_func.sql
+++ b/SAS/OTDB/sql/setSchedule_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2006
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/setTreeState_func.sql b/SAS/OTDB/sql/setTreeState_func.sql
index 04e5c624f57..bca0a7855ec 100644
--- a/SAS/OTDB/sql/setTreeState_func.sql
+++ b/SAS/OTDB/sql/setTreeState_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2005-2013
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/sql/updateVTnode_func.sql b/SAS/OTDB/sql/updateVTnode_func.sql
index bd80cdafda3..bf0dc53bf72 100644
--- a/SAS/OTDB/sql/updateVTnode_func.sql
+++ b/SAS/OTDB/sql/updateVTnode_func.sql
@@ -3,7 +3,7 @@
 --
 --  Copyright (C) 2005
 --  ASTRON (Netherlands Foundation for Research in Astronomy)
---  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+--  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 --
 --  This program is free software; you can redistribute it and/or modify
 --  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/src/Campaign.cc b/SAS/OTDB/src/Campaign.cc
index 3a3846fb4d1..0d5a9b44e0c 100644
--- a/SAS/OTDB/src/Campaign.cc
+++ b/SAS/OTDB/src/Campaign.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/src/CampaignInfo.cc b/SAS/OTDB/src/CampaignInfo.cc
index 1e9564f18a6..0d1bd7ebd15 100644
--- a/SAS/OTDB/src/CampaignInfo.cc
+++ b/SAS/OTDB/src/CampaignInfo.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2010
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/src/Converter.cc b/SAS/OTDB/src/Converter.cc
index a035e490d6f..99db2e1f7ea 100644
--- a/SAS/OTDB/src/Converter.cc
+++ b/SAS/OTDB/src/Converter.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/src/DefaultTemplate.cc b/SAS/OTDB/src/DefaultTemplate.cc
index 79fe77d437b..6a97e389627 100644
--- a/SAS/OTDB/src/DefaultTemplate.cc
+++ b/SAS/OTDB/src/DefaultTemplate.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/src/OTDBaction.cc b/SAS/OTDB/src/OTDBaction.cc
index 4c1c631c995..a08376ddc8f 100644
--- a/SAS/OTDB/src/OTDBaction.cc
+++ b/SAS/OTDB/src/OTDBaction.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/src/OTDBactionList.cc b/SAS/OTDB/src/OTDBactionList.cc
index 483f2b6075c..ea21751dcd6 100644
--- a/SAS/OTDB/src/OTDBactionList.cc
+++ b/SAS/OTDB/src/OTDBactionList.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/src/OTDBconnection.cc b/SAS/OTDB/src/OTDBconnection.cc
index a2cb26e1764..0c11207bed1 100644
--- a/SAS/OTDB/src/OTDBconnection.cc
+++ b/SAS/OTDB/src/OTDBconnection.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/src/OTDBcontrol.cc b/SAS/OTDB/src/OTDBcontrol.cc
index 44ffae46cca..1123c58db96 100644
--- a/SAS/OTDB/src/OTDBcontrol.cc
+++ b/SAS/OTDB/src/OTDBcontrol.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/src/OTDBevent.cc b/SAS/OTDB/src/OTDBevent.cc
index bb54c19b153..ccd7a01e3d3 100644
--- a/SAS/OTDB/src/OTDBevent.cc
+++ b/SAS/OTDB/src/OTDBevent.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/src/OTDBeventList.cc b/SAS/OTDB/src/OTDBeventList.cc
index be0d32047e5..42e42eff7ac 100644
--- a/SAS/OTDB/src/OTDBeventList.cc
+++ b/SAS/OTDB/src/OTDBeventList.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/src/OTDBnode.cc b/SAS/OTDB/src/OTDBnode.cc
index fb9f15e2a89..6d1aea3a4e3 100644
--- a/SAS/OTDB/src/OTDBnode.cc
+++ b/SAS/OTDB/src/OTDBnode.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/src/OTDBparam.cc b/SAS/OTDB/src/OTDBparam.cc
index 8fd13bb0c1c..cc114f8a9c9 100644
--- a/SAS/OTDB/src/OTDBparam.cc
+++ b/SAS/OTDB/src/OTDBparam.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/src/OTDBtree.cc b/SAS/OTDB/src/OTDBtree.cc
index 099d51da4b7..8e77d37245d 100644
--- a/SAS/OTDB/src/OTDBtree.cc
+++ b/SAS/OTDB/src/OTDBtree.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2011
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/src/OTDBvalue.cc b/SAS/OTDB/src/OTDBvalue.cc
index dbc869b1a93..b0350c98c75 100644
--- a/SAS/OTDB/src/OTDBvalue.cc
+++ b/SAS/OTDB/src/OTDBvalue.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/src/TreeMaintenance.cc b/SAS/OTDB/src/TreeMaintenance.cc
index 73106a57471..0ac93e64597 100644
--- a/SAS/OTDB/src/TreeMaintenance.cc
+++ b/SAS/OTDB/src/TreeMaintenance.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/src/TreeState.cc b/SAS/OTDB/src/TreeState.cc
index 4763b63bfe8..3715969d4d5 100644
--- a/SAS/OTDB/src/TreeState.cc
+++ b/SAS/OTDB/src/TreeState.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/src/TreeValue.cc b/SAS/OTDB/src/TreeValue.cc
index 3f0839b832e..b68a431fcd5 100644
--- a/SAS/OTDB/src/TreeValue.cc
+++ b/SAS/OTDB/src/TreeValue.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/src/VICnodeDef.cc b/SAS/OTDB/src/VICnodeDef.cc
index 8d2a42638f7..b2eae7d642e 100644
--- a/SAS/OTDB/src/VICnodeDef.cc
+++ b/SAS/OTDB/src/VICnodeDef.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/src/loadCompFile.cc b/SAS/OTDB/src/loadCompFile.cc
index 8dcfa6feb6b..9ea7db2e8a9 100644
--- a/SAS/OTDB/src/loadCompFile.cc
+++ b/SAS/OTDB/src/loadCompFile.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/src/misc.cc b/SAS/OTDB/src/misc.cc
index 461b8f663ef..5abc49d5909 100644
--- a/SAS/OTDB/src/misc.cc
+++ b/SAS/OTDB/src/misc.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/src/setStatus.cc b/SAS/OTDB/src/setStatus.cc
index ef460f9f333..5d8f89a43a6 100644
--- a/SAS/OTDB/src/setStatus.cc
+++ b/SAS/OTDB/src/setStatus.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2004-2012
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/src/wSpaceSplit.cc b/SAS/OTDB/src/wSpaceSplit.cc
index 9ea8ad2f269..f38f66c107c 100644
--- a/SAS/OTDB/src/wSpaceSplit.cc
+++ b/SAS/OTDB/src/wSpaceSplit.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/test/tBrokenHardware.cc b/SAS/OTDB/test/tBrokenHardware.cc
index c1d50159dcb..fa89b774081 100644
--- a/SAS/OTDB/test/tBrokenHardware.cc
+++ b/SAS/OTDB/test/tBrokenHardware.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/test/tCampaign.cc b/SAS/OTDB/test/tCampaign.cc
index 2fc62047d49..3392933258a 100644
--- a/SAS/OTDB/test/tCampaign.cc
+++ b/SAS/OTDB/test/tCampaign.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2010
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/test/tConnection.cc b/SAS/OTDB/test/tConnection.cc
index 942254b3e92..ed45c903270 100644
--- a/SAS/OTDB/test/tConnection.cc
+++ b/SAS/OTDB/test/tConnection.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/test/tMetadata.cc b/SAS/OTDB/test/tMetadata.cc
index d1159d9f28c..878157a9f45 100644
--- a/SAS/OTDB/test/tMetadata.cc
+++ b/SAS/OTDB/test/tMetadata.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/test/tPICtree.cc b/SAS/OTDB/test/tPICtree.cc
index 870b2ca4401..7e2d181e46d 100644
--- a/SAS/OTDB/test/tPICtree.cc
+++ b/SAS/OTDB/test/tPICtree.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/test/tPICvalue.cc b/SAS/OTDB/test/tPICvalue.cc
index fcb3095d5c9..63bce0bb228 100644
--- a/SAS/OTDB/test/tPICvalue.cc
+++ b/SAS/OTDB/test/tPICvalue.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/test/tParamTypeConv.cc b/SAS/OTDB/test/tParamTypeConv.cc
index 990514c8ae0..ddf65b0343b 100644
--- a/SAS/OTDB/test/tParamTypeConv.cc
+++ b/SAS/OTDB/test/tParamTypeConv.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/test/tQueryPIC.cc b/SAS/OTDB/test/tQueryPIC.cc
index b3acaea190c..63da8aca3d4 100644
--- a/SAS/OTDB/test/tQueryPIC.cc
+++ b/SAS/OTDB/test/tQueryPIC.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/test/tVHtree.cc b/SAS/OTDB/test/tVHtree.cc
index 1f1bf323fd7..456f970d53a 100644
--- a/SAS/OTDB/test/tVHtree.cc
+++ b/SAS/OTDB/test/tVHtree.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/test/tVHvalue.cc b/SAS/OTDB/test/tVHvalue.cc
index 10e7047521e..f615f16d5fe 100644
--- a/SAS/OTDB/test/tVHvalue.cc
+++ b/SAS/OTDB/test/tVHvalue.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/test/tVICcomp.cc b/SAS/OTDB/test/tVICcomp.cc
index a1dfefac19f..6c006868d57 100644
--- a/SAS/OTDB/test/tVICcomp.cc
+++ b/SAS/OTDB/test/tVICcomp.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/SAS/OTDB/test/tVTtree.cc b/SAS/OTDB/test/tVTtree.cc
index 3a16cb8e338..b15b1059741 100644
--- a/SAS/OTDB/test/tVTtree.cc
+++ b/SAS/OTDB/test/tVTtree.cc
@@ -2,7 +2,7 @@
 //#
 //#  Copyright (C) 2002-2004
 //#  ASTRON (Netherlands Foundation for Research in Astronomy)
-//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//#  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //#
 //#  This program is free software; you can redistribute it and/or modify
 //#  it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/basesim/BaseSimTreeModel.java b/support/tools/BaseSimGUI/src/org/astron/basesim/BaseSimTreeModel.java
index 5599f812612..cf524da06a1 100644
--- a/support/tools/BaseSimGUI/src/org/astron/basesim/BaseSimTreeModel.java
+++ b/support/tools/BaseSimGUI/src/org/astron/basesim/BaseSimTreeModel.java
@@ -1,6 +1,6 @@
 //  Copyright (C) 2000, 2001
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/basesim/Configuration.java b/support/tools/BaseSimGUI/src/org/astron/basesim/Configuration.java
index 720b4ad4fd1..6eef6d3ce3d 100644
--- a/support/tools/BaseSimGUI/src/org/astron/basesim/Configuration.java
+++ b/support/tools/BaseSimGUI/src/org/astron/basesim/Configuration.java
@@ -1,6 +1,6 @@
 //  Copyright (C) 2000, 2001
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/basesim/Connection.java b/support/tools/BaseSimGUI/src/org/astron/basesim/Connection.java
index 0fd78af408b..20fa3df5755 100644
--- a/support/tools/BaseSimGUI/src/org/astron/basesim/Connection.java
+++ b/support/tools/BaseSimGUI/src/org/astron/basesim/Connection.java
@@ -1,6 +1,6 @@
 //  Copyright (C) 2000, 2001
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/basesim/ConnectionStep.java b/support/tools/BaseSimGUI/src/org/astron/basesim/ConnectionStep.java
index d9c1418e465..2d5c4c934a9 100644
--- a/support/tools/BaseSimGUI/src/org/astron/basesim/ConnectionStep.java
+++ b/support/tools/BaseSimGUI/src/org/astron/basesim/ConnectionStep.java
@@ -1,6 +1,6 @@
 //  Copyright (C) 2000, 2001
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/basesim/ContHandlerSim.java b/support/tools/BaseSimGUI/src/org/astron/basesim/ContHandlerSim.java
index 3ea3029a0c4..a3ce7a7e697 100644
--- a/support/tools/BaseSimGUI/src/org/astron/basesim/ContHandlerSim.java
+++ b/support/tools/BaseSimGUI/src/org/astron/basesim/ContHandlerSim.java
@@ -1,6 +1,6 @@
 //  Copyright (C) 2000, 2001
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/basesim/ErrorHandlerSim.java b/support/tools/BaseSimGUI/src/org/astron/basesim/ErrorHandlerSim.java
index 24a25c124bf..8e5ec0f1c3e 100644
--- a/support/tools/BaseSimGUI/src/org/astron/basesim/ErrorHandlerSim.java
+++ b/support/tools/BaseSimGUI/src/org/astron/basesim/ErrorHandlerSim.java
@@ -1,6 +1,6 @@
 //  Copyright (C) 2000, 2001
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/basesim/Graph.java b/support/tools/BaseSimGUI/src/org/astron/basesim/Graph.java
index 030d64fb04d..d09ff17303a 100644
--- a/support/tools/BaseSimGUI/src/org/astron/basesim/Graph.java
+++ b/support/tools/BaseSimGUI/src/org/astron/basesim/Graph.java
@@ -1,6 +1,6 @@
 //  Copyright (C) 2000, 2001
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/basesim/GraphActionEvent.java b/support/tools/BaseSimGUI/src/org/astron/basesim/GraphActionEvent.java
index 459b4776e3a..1ec12c2257c 100644
--- a/support/tools/BaseSimGUI/src/org/astron/basesim/GraphActionEvent.java
+++ b/support/tools/BaseSimGUI/src/org/astron/basesim/GraphActionEvent.java
@@ -1,6 +1,6 @@
 //  Copyright (C) 2000, 2001
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/basesim/GraphActionListener.java b/support/tools/BaseSimGUI/src/org/astron/basesim/GraphActionListener.java
index 2fefee1443a..0717fd81a23 100644
--- a/support/tools/BaseSimGUI/src/org/astron/basesim/GraphActionListener.java
+++ b/support/tools/BaseSimGUI/src/org/astron/basesim/GraphActionListener.java
@@ -1,6 +1,6 @@
 //  Copyright (C) 2000, 2001
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/basesim/GraphComposite.java b/support/tools/BaseSimGUI/src/org/astron/basesim/GraphComposite.java
index 9e7a9e9b4d4..c6b852d63aa 100644
--- a/support/tools/BaseSimGUI/src/org/astron/basesim/GraphComposite.java
+++ b/support/tools/BaseSimGUI/src/org/astron/basesim/GraphComposite.java
@@ -1,6 +1,6 @@
 //  Copyright (C) 2000, 2001
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/basesim/GraphDataHolder.java b/support/tools/BaseSimGUI/src/org/astron/basesim/GraphDataHolder.java
index 3c40336275c..fe60d2ef331 100644
--- a/support/tools/BaseSimGUI/src/org/astron/basesim/GraphDataHolder.java
+++ b/support/tools/BaseSimGUI/src/org/astron/basesim/GraphDataHolder.java
@@ -1,6 +1,6 @@
 //  Copyright (C) 2000, 2001
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/basesim/GraphDiagram.java b/support/tools/BaseSimGUI/src/org/astron/basesim/GraphDiagram.java
index dd7fcb9afa1..ae892549eec 100644
--- a/support/tools/BaseSimGUI/src/org/astron/basesim/GraphDiagram.java
+++ b/support/tools/BaseSimGUI/src/org/astron/basesim/GraphDiagram.java
@@ -1,6 +1,6 @@
 //  Copyright (C) 2000, 2001
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/basesim/GraphException.java b/support/tools/BaseSimGUI/src/org/astron/basesim/GraphException.java
index f09d6325d6f..ea943be94e1 100644
--- a/support/tools/BaseSimGUI/src/org/astron/basesim/GraphException.java
+++ b/support/tools/BaseSimGUI/src/org/astron/basesim/GraphException.java
@@ -1,6 +1,6 @@
 //  Copyright (C) 2000, 2001
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/basesim/GraphManager.java b/support/tools/BaseSimGUI/src/org/astron/basesim/GraphManager.java
index e66dbd592c1..6b992342aee 100644
--- a/support/tools/BaseSimGUI/src/org/astron/basesim/GraphManager.java
+++ b/support/tools/BaseSimGUI/src/org/astron/basesim/GraphManager.java
@@ -1,6 +1,6 @@
 //  Copyright (C) 2000, 2001
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/basesim/GraphParamHolder.java b/support/tools/BaseSimGUI/src/org/astron/basesim/GraphParamHolder.java
index 8c28a9b6a48..d568c56c55f 100644
--- a/support/tools/BaseSimGUI/src/org/astron/basesim/GraphParamHolder.java
+++ b/support/tools/BaseSimGUI/src/org/astron/basesim/GraphParamHolder.java
@@ -1,6 +1,6 @@
 //  Copyright (C) 2000, 2001
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/basesim/GraphSimul.java b/support/tools/BaseSimGUI/src/org/astron/basesim/GraphSimul.java
index b2806057dbc..9c924c25d78 100644
--- a/support/tools/BaseSimGUI/src/org/astron/basesim/GraphSimul.java
+++ b/support/tools/BaseSimGUI/src/org/astron/basesim/GraphSimul.java
@@ -1,6 +1,6 @@
 //  Copyright (C) 2000, 2001
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/basesim/GraphStep.java b/support/tools/BaseSimGUI/src/org/astron/basesim/GraphStep.java
index f4a52369b8f..21cd645c39b 100644
--- a/support/tools/BaseSimGUI/src/org/astron/basesim/GraphStep.java
+++ b/support/tools/BaseSimGUI/src/org/astron/basesim/GraphStep.java
@@ -1,6 +1,6 @@
 //  Copyright (C) 2000, 2001
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/basesim/GraphWorkHolder.java b/support/tools/BaseSimGUI/src/org/astron/basesim/GraphWorkHolder.java
index b0ce7043dd0..24adaededf6 100644
--- a/support/tools/BaseSimGUI/src/org/astron/basesim/GraphWorkHolder.java
+++ b/support/tools/BaseSimGUI/src/org/astron/basesim/GraphWorkHolder.java
@@ -1,6 +1,6 @@
 //  Copyright (C) 2000, 2001
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/basesim/JBaseSim.java b/support/tools/BaseSimGUI/src/org/astron/basesim/JBaseSim.java
index 435209aba38..cf764f95a79 100644
--- a/support/tools/BaseSimGUI/src/org/astron/basesim/JBaseSim.java
+++ b/support/tools/BaseSimGUI/src/org/astron/basesim/JBaseSim.java
@@ -1,6 +1,6 @@
 //  Copyright (C) 2000, 2001
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/basesim/JTestGraph.java b/support/tools/BaseSimGUI/src/org/astron/basesim/JTestGraph.java
index d2704dd9ba4..932cca88bd5 100644
--- a/support/tools/BaseSimGUI/src/org/astron/basesim/JTestGraph.java
+++ b/support/tools/BaseSimGUI/src/org/astron/basesim/JTestGraph.java
@@ -1,6 +1,6 @@
 //  Copyright (C) 2000, 2001
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/basesim/LayoutCentered.java b/support/tools/BaseSimGUI/src/org/astron/basesim/LayoutCentered.java
index b5ed54c5fb8..54ae6611a4e 100644
--- a/support/tools/BaseSimGUI/src/org/astron/basesim/LayoutCentered.java
+++ b/support/tools/BaseSimGUI/src/org/astron/basesim/LayoutCentered.java
@@ -1,6 +1,6 @@
 //  Copyright (C) 2000, 2001
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/basesim/LayoutController.java b/support/tools/BaseSimGUI/src/org/astron/basesim/LayoutController.java
index 3bb602903f3..65424dc3b76 100644
--- a/support/tools/BaseSimGUI/src/org/astron/basesim/LayoutController.java
+++ b/support/tools/BaseSimGUI/src/org/astron/basesim/LayoutController.java
@@ -1,6 +1,6 @@
 //  Copyright (C) 2000, 2001
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/basesim/LayoutDataHolder.java b/support/tools/BaseSimGUI/src/org/astron/basesim/LayoutDataHolder.java
index 38ac77958bc..e8dd796c2db 100644
--- a/support/tools/BaseSimGUI/src/org/astron/basesim/LayoutDataHolder.java
+++ b/support/tools/BaseSimGUI/src/org/astron/basesim/LayoutDataHolder.java
@@ -1,6 +1,6 @@
 //  Copyright (C) 2000, 2001
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/basesim/LayoutFlow.java b/support/tools/BaseSimGUI/src/org/astron/basesim/LayoutFlow.java
index 19b00ec0879..008c1153641 100644
--- a/support/tools/BaseSimGUI/src/org/astron/basesim/LayoutFlow.java
+++ b/support/tools/BaseSimGUI/src/org/astron/basesim/LayoutFlow.java
@@ -1,6 +1,6 @@
 //  Copyright (C) 2000, 2001
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/basesim/LayoutSimul.java b/support/tools/BaseSimGUI/src/org/astron/basesim/LayoutSimul.java
index 9494265f7ff..1a513214230 100644
--- a/support/tools/BaseSimGUI/src/org/astron/basesim/LayoutSimul.java
+++ b/support/tools/BaseSimGUI/src/org/astron/basesim/LayoutSimul.java
@@ -1,6 +1,6 @@
 //  Copyright (C) 2000, 2001
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/basesim/Main.java b/support/tools/BaseSimGUI/src/org/astron/basesim/Main.java
index 7a50710714f..6ffcb1cbdc3 100644
--- a/support/tools/BaseSimGUI/src/org/astron/basesim/Main.java
+++ b/support/tools/BaseSimGUI/src/org/astron/basesim/Main.java
@@ -1,6 +1,6 @@
 //  Copyright (C) 2000, 2001
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/basesim/MessageGraph.java b/support/tools/BaseSimGUI/src/org/astron/basesim/MessageGraph.java
index 784136aab01..7bed92fb79d 100644
--- a/support/tools/BaseSimGUI/src/org/astron/basesim/MessageGraph.java
+++ b/support/tools/BaseSimGUI/src/org/astron/basesim/MessageGraph.java
@@ -1,6 +1,6 @@
 //  Copyright (C) 2000, 2001
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/basesim/MessageXML.java b/support/tools/BaseSimGUI/src/org/astron/basesim/MessageXML.java
index 2f4af65289f..eeae71bd6da 100644
--- a/support/tools/BaseSimGUI/src/org/astron/basesim/MessageXML.java
+++ b/support/tools/BaseSimGUI/src/org/astron/basesim/MessageXML.java
@@ -1,6 +1,6 @@
 //  Copyright (C) 2000, 2001
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/basesim/SelectionManager.java b/support/tools/BaseSimGUI/src/org/astron/basesim/SelectionManager.java
index 4d58a0f276b..d64b6f48cfe 100644
--- a/support/tools/BaseSimGUI/src/org/astron/basesim/SelectionManager.java
+++ b/support/tools/BaseSimGUI/src/org/astron/basesim/SelectionManager.java
@@ -1,6 +1,6 @@
 //  Copyright (C) 2000, 2001
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/basesim/TestMain.java b/support/tools/BaseSimGUI/src/org/astron/basesim/TestMain.java
index 1550b634ab8..403a73f83d8 100644
--- a/support/tools/BaseSimGUI/src/org/astron/basesim/TestMain.java
+++ b/support/tools/BaseSimGUI/src/org/astron/basesim/TestMain.java
@@ -1,6 +1,6 @@
 //  Copyright (C) 2000, 2001
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/util/Sample.java b/support/tools/BaseSimGUI/src/org/astron/util/Sample.java
index e769ad9bbae..6c7ed1cb738 100644
--- a/support/tools/BaseSimGUI/src/org/astron/util/Sample.java
+++ b/support/tools/BaseSimGUI/src/org/astron/util/Sample.java
@@ -1,6 +1,6 @@
 //  Copyright (C) 2000, 2001
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/util/gui/JNotifier.java b/support/tools/BaseSimGUI/src/org/astron/util/gui/JNotifier.java
index 018f107bd4f..d690ad6796f 100644
--- a/support/tools/BaseSimGUI/src/org/astron/util/gui/JNotifier.java
+++ b/support/tools/BaseSimGUI/src/org/astron/util/gui/JNotifier.java
@@ -1,6 +1,6 @@
 //  Copyright (C) 2000, 2001
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/util/gui/MessageEvent.java b/support/tools/BaseSimGUI/src/org/astron/util/gui/MessageEvent.java
index 520e2f506c2..34310511c19 100644
--- a/support/tools/BaseSimGUI/src/org/astron/util/gui/MessageEvent.java
+++ b/support/tools/BaseSimGUI/src/org/astron/util/gui/MessageEvent.java
@@ -1,6 +1,6 @@
 //  Copyright (C) 2000, 2001
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/support/tools/BaseSimGUI/src/org/astron/util/gui/MessageListener.java b/support/tools/BaseSimGUI/src/org/astron/util/gui/MessageListener.java
index 730ae3d7be7..e505de4e0c9 100644
--- a/support/tools/BaseSimGUI/src/org/astron/util/gui/MessageListener.java
+++ b/support/tools/BaseSimGUI/src/org/astron/util/gui/MessageListener.java
@@ -1,6 +1,6 @@
 //  Copyright (C) 2000, 2001
 //  ASTRON (Netherlands Foundation for Research in Astronomy)
-//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+//  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
 //
 //  This program is free software; you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
diff --git a/support/tools/wrapexec/src/wrapexec.cc b/support/tools/wrapexec/src/wrapexec.cc
index 5db15949343..bdcdc17826f 100644
--- a/support/tools/wrapexec/src/wrapexec.cc
+++ b/support/tools/wrapexec/src/wrapexec.cc
@@ -13,7 +13,7 @@
  *
  *  Copyright (C) 2000,2001,2002
  *  ASTRON (Netherlands Foundation for Research in Astronomy)
- *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, seg@astron.nl
+ *  P.O.Box 2, 7990 AA Dwingeloo, The Netherlands, softwaresupport@astron.nl
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
-- 
GitLab