Change naming of ExperimentSetup.setupId to ExperimentSetup.experimentSetupId