diff --git a/dcapi/condor/condor_server.cc b/dcapi/condor/condor_master.cc
similarity index 100%
rename from dcapi/condor/condor_server.cc
rename to dcapi/condor/condor_master.cc
diff --git a/dcapi/condor/condor_server.h b/dcapi/condor/condor_master.h
similarity index 100%
rename from dcapi/condor/condor_server.h
rename to dcapi/condor/condor_master.h
diff --git a/dcapi/condor/condor_client.c b/dcapi/condor/condor_slave.c
similarity index 100%
rename from dcapi/condor/condor_client.c
rename to dcapi/condor/condor_slave.c