diff --git a/code/game/gamemodes/epidemic/epidemic.dm b/code/game/gamemodes/epidemic/epidemic.dm
index c531478f556..47df0690238 100644
--- a/code/game/gamemodes/epidemic/epidemic.dm
+++ b/code/game/gamemodes/epidemic/epidemic.dm
@@ -16,7 +16,7 @@
 /datum/game_mode/epidemic/pre_setup()
 	doctors = 0
 	for(var/mob/abstract/new_player/player in world)
-		if(player.mind.assigned_role in list("Chief Medical Officer","Medical Doctor"))
+		if(player.mind.assigned_role in list("Chief Medical Officer","Physician"))
 			doctors++
 			break
 
diff --git a/code/game/jobs/faction/necropolis.dm b/code/game/jobs/faction/necropolis.dm
index 258e39c9fbe..ca26b4f5abd 100644
--- a/code/game/jobs/faction/necropolis.dm
+++ b/code/game/jobs/faction/necropolis.dm
@@ -53,9 +53,9 @@
 	titles_to_loadout = list(
 		"Security Officer" = /datum/outfit/job/officer/necropolis,
 		"Warden" = /datum/outfit/job/warden/necropolis,
-		"Medical Doctor" = /datum/outfit/job/doctor/necropolis,
+		"Physician" = /datum/outfit/job/doctor/necropolis,
 		"Surgeon" = /datum/outfit/job/doctor/necropolis,
-		"Emergency Phyisician" = /datum/outfit/job/doctor/necropolis,
+		"Trauma Physician" = /datum/outfit/job/doctor/necropolis,
 		"Nurse" = /datum/outfit/job/doctor/necropolis,
 		"Pharmacist" = /datum/outfit/job/pharmacist/necropolis,
 		"Biochemist" = /datum/outfit/job/pharmacist/necropolis,
@@ -87,7 +87,7 @@
 	id = /obj/item/card/id/necropolis/sec
 
 /datum/outfit/job/doctor/necropolis
-	name = "Medical Doctor - Necropolis"
+	name = "Physician - Necropolis"
 	uniform = /obj/item/clothing/under/rank/necropolis/research
 	id = /obj/item/card/id/necropolis
 
diff --git a/code/game/jobs/faction/zeng_hu.dm b/code/game/jobs/faction/zeng_hu.dm
index bd1a29228a4..f022c885d1e 100644
--- a/code/game/jobs/faction/zeng_hu.dm
+++ b/code/game/jobs/faction/zeng_hu.dm
@@ -12,7 +12,7 @@
 	</p>
 	<p>Some character examples are:
 	<ul>
-	<li><b>Senior Medical Doctor</b>: Zeng-Hu has some of the best medical staff
+	<li><b>Senior Physician</b>: Zeng-Hu has some of the best medical staff
 	in the world and you are one of them. Highly trained and highly experienced
 	you are better then the rest save your colleagues in Zeng-Hu. You expect to
 	be heard and obeyed. Your bedside manner is impeccable and far out classes
@@ -52,9 +52,9 @@
 	)
 
 	titles_to_loadout = list(
-		"Medical Doctor" = /datum/outfit/job/doctor/zeng_hu,
+		"Physician" = /datum/outfit/job/doctor/zeng_hu,
 		"Surgeon" = /datum/outfit/job/doctor/zeng_hu,
-		"Emergency Phyisician" = /datum/outfit/job/doctor/zeng_hu,
+		"Trauma Physician" = /datum/outfit/job/doctor/zeng_hu,
 		"Nurse" = /datum/outfit/job/doctor/zeng_hu,
 		"Pharmacist" = /datum/outfit/job/pharmacist/zeng_hu,
 		"Biochemist" = /datum/outfit/job/pharmacist/zeng_hu,
@@ -71,7 +71,7 @@
 	)
 
 /datum/outfit/job/doctor/zeng_hu
-	name = "Medical Doctor - Zeng-Hu"
+	name = "Physician - Zeng-Hu"
 	uniform = /obj/item/clothing/under/rank/zeng
 	id = /obj/item/card/id/zeng_hu
 
diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm
index a60650f3c1f..de03f8c05f8 100644
--- a/code/game/jobs/job/medical.dm
+++ b/code/game/jobs/job/medical.dm
@@ -47,13 +47,13 @@
 	messengerbag = /obj/item/storage/backpack/messenger/med
 
 /datum/job/doctor
-	title = "Medical Doctor"
+	title = "Physician"
 	flag = DOCTOR
 	department = "Medical"
 	department_flag = MEDSCI
 	faction = "Station"
-	total_positions = 5
-	spawn_positions = 3
+	total_positions = 4
+	spawn_positions = 4
 	supervisors = "the chief medical officer"
 	selection_color = "#FF97D1"
 	economic_modifier = 7
@@ -62,18 +62,36 @@
 
 	access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_pharmacy, access_virology, access_genetics, access_eva)
 	minimal_access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_genetics, access_eva)
-	alt_titles = list("Surgeon","Trauma Physician","Nurse")
+	alt_titles = list("Trauma Physician","Nurse")
 	alt_ages = list("Nurse" = 25)
 	outfit = /datum/outfit/job/doctor
 	alt_outfits = list(
 		"Trauma Physician"=/datum/outfit/job/doctor/trauma_physician,
-		"Surgeon"=/datum/outfit/job/doctor/surgeon,
 		"Nurse"=/datum/outfit/job/doctor/nurse
 		)
 
+/datum/job/surgeon
+	title = "Surgeon"
+	flag = SURGEON
+	department = "Medical"
+	department_flag = MEDSCI
+	faction = "Station"
+	supervisors = "the chief medical officer"
+	selection_color = "#FF97D1"
+	economic_modifier = 7
+
+	spawn_positions = 2
+	total_positions = 2
+
+	minimum_character_age = 30
+
+	access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_pharmacy, access_virology, access_genetics, access_eva)
+	minimal_access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_genetics, access_eva)
+	outfit = /datum/outfit/job/doctor/surgeon
+
 /datum/outfit/job/doctor
-	name = "Medical Doctor"
-	base_name = "Medical Doctor"
+	name = "Physician"
+	base_name = "Physician"
 	jobtype = /datum/job/doctor
 
 	uniform = /obj/item/clothing/under/rank/medical
diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm
index 3eb05d77355..8985ed20278 100644
--- a/code/game/jobs/jobs.dm
+++ b/code/game/jobs/jobs.dm
@@ -23,13 +23,15 @@ var/const/SCIENTIST			=(1<<1)
 var/const/CHEMIST			=(1<<2)
 var/const/CMO				=(1<<3)
 var/const/DOCTOR			=(1<<4)
-var/const/VIROLOGIST		=(1<<5)
-var/const/PSYCHIATRIST		=(1<<6)
-var/const/ROBOTICIST		=(1<<7)
-var/const/XENOBIOLOGIST		=(1<<8)
-var/const/PARAMEDIC			=(1<<9)
-var/const/INTERN_MED		=(1<<10)
-var/const/INTERN_SCI		=(1<<11)
+var/const/SURGEON			=(1<<5)
+var/const/VIROLOGIST		=(1<<6)
+var/const/PSYCHIATRIST		=(1<<7)
+var/const/ROBOTICIST		=(1<<8)
+var/const/XENOBIOLOGIST		=(1<<9)
+var/const/PARAMEDIC			=(1<<10)
+var/const/INTERN_MED		=(1<<11)
+var/const/INTERN_SCI		=(1<<12)
+
 
 var/const/CIVILIAN			=(1<<2)
 
@@ -74,7 +76,8 @@ var/list/engineering_positions = list(
 
 var/list/medical_positions = list(
 	"Chief Medical Officer",
-	"Medical Doctor",
+	"Physician",
+	"Surgeon",
 	"Psychiatrist",
 	"Pharmacist",
 	"Paramedic",
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index 5307be8645f..b1c492d7602 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -628,8 +628,8 @@
 	icon_state = "librarian"
 
 /obj/item/toy/figure/md
-	name = "medical doctor action figure"
-	desc = "A \"Space Life\" brand medical doctor action figure."
+	name = "physician action figure"
+	desc = "A \"Space Life\" brand physician action figure."
 	icon_state = "md"
 
 /obj/item/toy/figure/mime
diff --git a/code/game/objects/items/weapons/implants/implantcircuits.dm b/code/game/objects/items/weapons/implants/implantcircuits.dm
index 1fc7b035623..8eb9510bc25 100644
--- a/code/game/objects/items/weapons/implants/implantcircuits.dm
+++ b/code/game/objects/items/weapons/implants/implantcircuits.dm
@@ -9,7 +9,7 @@
 	return TRUE
 
 /obj/item/implant/integrated_circuit/Initialize()
-	..()
+	. = ..()
 	IC = new(src)
 	IC.implant = src
 
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
index eee9a4d439a..bed06a3debd 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
@@ -42,7 +42,7 @@
 	new /obj/item/clothing/mask/breath/medical(src)
 
 /obj/structure/closet/secure_closet/medical3
-	name = "medical doctor's locker"
+	name = "physician's locker"
 	req_access = list(access_medical_equip)
 	icon_state = "securemed1"
 	icon_closed = "securemed"
diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm
index d295e9deb6c..35a12e7578c 100644
--- a/code/modules/awaymissions/corpse.dm
+++ b/code/modules/awaymissions/corpse.dm
@@ -146,8 +146,8 @@
 	corpsepocket1 = /obj/item/device/flashlight/pen
 	corpseshoes = /obj/item/clothing/shoes/black
 	corpseid = 1
-	corpseidjob = "Medical Doctor"
-	corpseidaccess = "Medical Doctor"
+	corpseidjob = "Physician"
+	corpseidaccess = "Physician"
 
 /obj/effect/landmark/corpse/engineer
 	name = "Engineer"
diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories.dm b/code/modules/client/preference_setup/loadout/loadout_accessories.dm
index 404f26bd28a..7b69d3bc284 100644
--- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm
@@ -99,7 +99,7 @@
 /datum/gear/accessory/white_vest
 	display_name = "webbing, medical"
 	path = /obj/item/clothing/accessory/storage/white_vest
-	allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Pharmacist", "Psychiatrist", "Paramedic", "Medical Resident")
+	allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Psychiatrist", "Paramedic", "Medical Resident")
 
 /datum/gear/accessory/webbing
 	display_name = "webbing, simple"
@@ -119,7 +119,7 @@
 /datum/gear/accessory/white_pouches
 	display_name = "drop pouches, medical"
 	path = /obj/item/clothing/accessory/storage/pouches/white
-	allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Pharmacist","Psychiatrist", "Paramedic", "Medical Resident")
+	allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Psychiatrist", "Paramedic", "Medical Resident")
 
 /datum/gear/accessory/pouches
 	display_name = "drop pouches, simple"
diff --git a/code/modules/client/preference_setup/loadout/loadout_eyes.dm b/code/modules/client/preference_setup/loadout/loadout_eyes.dm
index 67a95fdec92..f9f5c164c59 100644
--- a/code/modules/client/preference_setup/loadout/loadout_eyes.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_eyes.dm
@@ -64,7 +64,7 @@
 /datum/gear/eyes/medical
 	display_name = "medical HUD"
 	path = /obj/item/clothing/glasses/hud/health
-	allowed_roles = list("Medical Doctor", "Chief Medical Officer", "Pharmacist", "Paramedic", "Psychiatrist", "Medical Resident")
+	allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "Paramedic", "Psychiatrist", "Medical Resident")
 
 /datum/gear/eyes/medical/aviator
 	display_name = "aviators, medical"
@@ -108,7 +108,7 @@
 /datum/gear/eyes/medpatch
 	display_name = "HUDpatch, Medical"
 	path = /obj/item/clothing/glasses/eyepatch/hud/medical
-	allowed_roles = list("Medical Doctor", "Chief Medical Officer", "Pharmacist", "Paramedic", "Psychiatrist", "Medical Resident")
+	allowed_roles = list("Physician", "Surgeon", "Chief Medical Officer", "Pharmacist", "Paramedic", "Psychiatrist", "Medical Resident")
 	cost = 2
 
 /datum/gear/eyes/mespatch
diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm
index c4f1a76b8d1..fbe5af6fb2e 100644
--- a/code/modules/client/preference_setup/loadout/loadout_head.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_head.dm
@@ -80,7 +80,7 @@
 /datum/gear/head/beret/medical
 	display_name = "beret, medical"
 	path = /obj/item/clothing/head/beret/medical
-	allowed_roles = list("Medical Doctor", "Medical Resident", "Pharmacist", "Paramedic", "Chief Medial Officer", "Psychiatrist")
+	allowed_roles = list("Physician", "Surgeon", "Medical Resident", "Pharmacist", "Paramedic", "Chief Medial Officer", "Psychiatrist")
 
 /datum/gear/head/corp
 	display_name = "cap, corporate (security)"
@@ -201,7 +201,7 @@
 /datum/gear/head/surgical
 	display_name = "surgical cap selection"
 	path = /obj/item/clothing/head/surgery/blue
-	allowed_roles = list("Scientist", "Chief Medical Officer", "Medical Doctor", "Geneticist", "Pharmacist", "Paramedic", "Medical Resident", "Xenobiologist", "Roboticist", "Research Director", "Forensic Technician")
+	allowed_roles = list("Scientist", "Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Paramedic", "Medical Resident", "Xenobiologist", "Roboticist", "Research Director", "Forensic Technician")
 
 /datum/gear/head/surgical/New()
 	..()
@@ -243,7 +243,7 @@
 /datum/gear/head/iacberet
 	display_name = "IAC Beret"
 	path = /obj/item/clothing/head/soft/iacberet
-	allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Pharmacist", "Paramedic", "Medical Resident")
+	allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Paramedic", "Medical Resident")
 
 /datum/gear/head/circuitry
 	display_name = "headwear, circuitry (empty)"
diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm
index 0ac9c40998d..86bb4ed10fa 100644
--- a/code/modules/client/preference_setup/loadout/loadout_suit.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm
@@ -95,13 +95,13 @@
 	display_name = "surgical apron"
 	path = /obj/item/clothing/suit/apron/surgery
 	cost = 1
-	allowed_roles = list("Scientist", "Chief Medical Officer", "Medical Doctor", "Pharmacist", "Geneticist", "Paramedic", "Medical Resident", "Xenobiologist", "Roboticist", "Research Director", "Forensic Technician")
+	allowed_roles = list("Scientist", "Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Geneticist", "Paramedic", "Medical Resident", "Xenobiologist", "Roboticist", "Research Director", "Forensic Technician")
 
 /datum/gear/suit/iacvest
 	display_name = "IAC vest"
 	description = "It's a lightweight vest. Made of a dark, navy mesh with highly-reflective white material, designed to be worn by the Interstellar Aid Corps."
 	path = /obj/item/clothing/suit/storage/iacvest
-	allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Pharmacist", "Paramedic", "Medical Resident")
+	allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Paramedic", "Medical Resident")
 
 /datum/gear/suit/poncho
 	display_name = "poncho selection"
@@ -190,7 +190,7 @@
 /datum/gear/suit/winter/medical
 	display_name = "winter coat, medical"
 	path = /obj/item/clothing/suit/storage/hooded/wintercoat/medical
-	allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Paramedic", "Medical Resident", "Psychiatrist", "Pharmacist")
+	allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Paramedic", "Medical Resident", "Psychiatrist", "Pharmacist")
 
 /datum/gear/suit/winter/engineering
 	display_name = "winter coat, engineering"
diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm
index 429e702b5e1..2fc61fb1a00 100644
--- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm
@@ -24,7 +24,7 @@
 /datum/gear/uniform/iacjumpsuit
 	display_name = "IAC Jumpsuit"
 	path = /obj/item/clothing/under/rank/iacjumpsuit
-	allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Pharmacist", "Paramedic", "Medical Resident")
+	allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Paramedic", "Medical Resident")
 
 /datum/gear/uniform/jumpsuit
 	display_name = "generic jumpsuits"
@@ -103,7 +103,7 @@
 /datum/gear/uniform/scrubs
 	display_name = "scrubs selection"
 	path = /obj/item/clothing/under/rank/medical/black
-	allowed_roles = list("Scientist","Chief Medical Officer", "Medical Doctor", "Pharmacist", "Geneticist", "Paramedic", "Medical Resident", "Xenobiologist", "Roboticist", "Research Director", "Forensic Technician")
+	allowed_roles = list("Scientist","Chief Medical Officer", "Physician", "Surgeon", "Pharmacist", "Geneticist", "Paramedic", "Medical Resident", "Xenobiologist", "Roboticist", "Research Director", "Forensic Technician")
 
 /datum/gear/uniform/scrubs/New()
 	..()
diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm b/code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm
index 48b5ad99dcc..e22d5cc179e 100644
--- a/code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_xeno/tajara.dm
@@ -56,7 +56,7 @@
 	display_name = "PRA medical coat"
 	path = /obj/item/clothing/suit/storage/toggle/labcoat/tajaran
 	whitelisted = list("Tajara", "Zhan-Khazan Tajara", "M'sai Tajara")
-	allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Paramedic", "Medical Resident")
+	allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Chemist", "Geneticist", "Paramedic", "Medical Resident")
 	sort_category = "Xenowear - Tajara"
 
 /datum/gear/uniform/tajara
diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno/unathi.dm b/code/modules/client/preference_setup/loadout/loadout_xeno/unathi.dm
index 8788a37b239..a7cc20e727e 100644
--- a/code/modules/client/preference_setup/loadout/loadout_xeno/unathi.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_xeno/unathi.dm
@@ -74,7 +74,7 @@
 	whitelisted = list("Aut'akh Unathi")
 	sort_category = "Xenowear - Unathi"
 	cost = 3
-	allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Paramedic", "Medical Resident", "Psychiatrist", "Chemist")
+	allowed_roles = list("Chief Medical Officer", "Physician", "Surgeon", "Paramedic", "Medical Resident", "Psychiatrist", "Chemist")
 
 /datum/gear/autakh_security
 	display_name = "security grasper"
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index f8430dd5e26..742d164f589 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -106,7 +106,7 @@ datum/preferences
 	var/list/organ_data = list()
 	var/list/rlimb_data = list()
 	var/list/body_markings = list() // "name" = "#rgbcolor"
-	var/list/player_alt_titles = new()		// the default name of a job like "Medical Doctor"
+	var/list/player_alt_titles = new()		// the default name of a job like "Physician"
 
 	var/list/flavor_texts = list()
 	var/list/flavour_texts_robot = list()
diff --git a/code/modules/clothing/under/jobs/medsci.dm b/code/modules/clothing/under/jobs/medsci.dm
index a7606ea3b48..1b418403c41 100644
--- a/code/modules/clothing/under/jobs/medsci.dm
+++ b/code/modules/clothing/under/jobs/medsci.dm
@@ -155,7 +155,7 @@
 
 /obj/item/clothing/under/rank/medical
 	desc = "It's made of a special fiber that provides minor protection against biohazards. It denotes that the wearer is trained medical personnel."
-	name = "medical doctor's jumpsuit"
+	name = "physician's jumpsuit"
 	icon_state = "medical"
 	item_state = "w_suit"
 	worn_state = "medical"
diff --git a/code/modules/integrated_electronics/subtypes/input.dm b/code/modules/integrated_electronics/subtypes/input.dm
index 839ddd9fb0c..47ccd96e38f 100644
--- a/code/modules/integrated_electronics/subtypes/input.dm
+++ b/code/modules/integrated_electronics/subtypes/input.dm
@@ -345,7 +345,7 @@
 	var/datum/radio_frequency/radio_connection
 
 /obj/item/integrated_circuit/input/signaler/Initialize()
-	..()
+	. = ..()
 	set_frequency(frequency)
 	// Set the pins so when someone sees them, they won't show as null
 	set_pin_data(IC_INPUT, 1, frequency)
diff --git a/code/modules/mob/living/carbon/brain/death.dm b/code/modules/mob/living/carbon/brain/death.dm
index 154126fda8d..b4e77b8ee0d 100644
--- a/code/modules/mob/living/carbon/brain/death.dm
+++ b/code/modules/mob/living/carbon/brain/death.dm
@@ -6,7 +6,7 @@
 		return ..(gibbed,"no message")
 
 /mob/living/carbon/brain/gib()
-	if(istype(container, /obj/item/device/mmi))
+	if(container)
 		QDEL_NULL(container)//Gets rid of the MMI if there is one
 	if(loc)
 		if(istype(loc,/obj/item/organ/internal/brain))
diff --git a/config/example/jobs.txt b/config/example/jobs.txt
index c9a027769ea..8698ba6b675 100644
--- a/config/example/jobs.txt
+++ b/config/example/jobs.txt
@@ -8,7 +8,7 @@ Chief Medical Officer=1
 Station Engineer=5
 Roboticist=1
 
-Medical Doctor=5
+Physician=5
 Chemist=2
 
 Scientist=3
diff --git a/config/example/tips.txt b/config/example/tips.txt
index d331e04e926..915ce2c6474 100644
--- a/config/example/tips.txt
+++ b/config/example/tips.txt
@@ -17,9 +17,9 @@ As the Captain, you are one of the highest priority targets on the station. Ever
 As the Captain, you have absolute access and control over the station, but this does not mean that being a horrible person won't result in mutiny and a ban.
 As the Chief Medical Officer, your hypospray is like an instant injection syringe that can hold 30 units as opposed to the standard 15.
 As the Chief Medical Officer, coordinate and communicate with your doctors, chemists, and EMTs during a pirate raid, blob infestation, or some other crisis to keep people alive and fighting.
-As a Medical Doctor, you can attempt to drain blood from a husk with a syringe to determine the cause. If you can extract blood, it was caused by extreme temperatures or lasers, if there is no blood to extract, it was caused by something unnatural.
-As a Medical Doctor, you can surgically implant or extract things from people's chests. This can range from putting in a bomb to pulling out an alien larva.
-As a Medical Doctor, you must target the correct limb and be on help intent when trying to perform surgery on someone.
+As a Physician, you can attempt to drain blood from a husk with a syringe to determine the cause. If you can extract blood, it was caused by extreme temperatures or lasers, if there is no blood to extract, it was caused by something unnatural.
+As a Physician, you can surgically implant or extract things from people's chests. This can range from putting in a bomb to pulling out an alien larva.
+As a Physician, you must target the correct limb and be on help intent when trying to perform surgery on someone.
 As a Chemist, there are dozens of chemicals that can heal, and even more that can cause harm. Experiment!
 As the Biochemist, you only require small amounts of vaccine to heal a sick patient. Use your chemistry access to distribute your cures more efficiently.
 As the Research Director, you can take AIs out of their cores by loading them into an intelliCard, and then from there into an AI system integrity restorer computer to revive and/or repair them.
@@ -137,7 +137,7 @@ Service borgs can use the special maidborg sprite if they pray hard enough.
 Chainswords and energy weapons can slice both walls and people.
 If you see this message something has gone seriously wrong.
 If you're having trouble as an antagonist, consider a Dionaea whitelist.
-As a Medical Doctor, you can attach limbs from one species to the torso of another species. You too can make your own Frankenstein monster!
+As a Physician, you can attach limbs from one species to the torso of another species. You too can make your own Frankenstein monster!
 The second antag contest is still running, you know.
 Killing mice on sight is not and never will be gank, no matter how much people complain.
 Unathi are the only species capable of wearing the rare Breacher hardsuits.
diff --git a/html/archivedchangelog.html b/html/archivedchangelog.html
index 9831f594c14..36a117bb533 100644
--- a/html/archivedchangelog.html
+++ b/html/archivedchangelog.html
@@ -63,7 +63,7 @@ Stick old posts here to prevent cluttering of main changelog.
 	<h2 class="date">14.11.12</h2>
 	<h3 class="author">Chinsky updated:</h3>
 	<ul class="changes bgimages16">
-		<li class="tweak">Virologist are now alt title of Medical Doctor, like Surgeon or EMT. All medical jobs now have virology access.</li>
+		<li class="tweak">Virologist are now alt title of Physician, like Surgeon or EMT. All medical jobs now have virology access.</li>
 		<li class="rscadd">Added scientist alt titles.</li>
 	</ul>
 	<h3 class="author">CIB updated:</h3>
@@ -677,7 +677,7 @@ Stick old posts here to prevent cluttering of main changelog.
 	<h2 class="date">17 May 2012</h2>
 	<h3 class="author">TG updated:</h3>
 	<ul class="changes bgimages16">
-		<li class="rscadd">Added WJohnston's scrubs to Medical Doctor lockers.</li>
+		<li class="rscadd">Added WJohnston's scrubs to Physician lockers.</li>
 		<li class="rscadd">Added two new syndicate bundles</li>
 		<li class="rscadd">Added WJohnston's CMO bio hood</li>
 		<li class="tweak">Reduced cost of thermals to 3 telecrystals (formerly 4)</li>
diff --git a/html/changelog.html b/html/changelog.html
index 39fdd97cd22..507178b43ae 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -2159,7 +2159,7 @@
 			<h3 class="author">ParadoxSpace & AmoryBlaine updated:</h3>
 			<ul class="changes bgimages16">
 				<li class="rscadd">Adds a helmet and a chest-rig for Paramedics and EMTs. Sprites by the ever-loving AmoryBlaine.</li>
-				<li class="rscadd">Medical Doctor lockers now contain HUDpatches.</li>
+				<li class="rscadd">Physician lockers now contain HUDpatches.</li>
 				<li class="rscadd">Chest-rigs and Paramedic jackets can now hold blood bags.</li>
 			</ul>
 
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index b84460df1e3..ba798cc01d8 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -9744,7 +9744,7 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   ParadoxSpace & AmoryBlaine:
   - rscadd: Adds a helmet and a chest-rig for Paramedics and EMTs. Sprites by the
       ever-loving AmoryBlaine.
-  - rscadd: Medical Doctor lockers now contain HUDpatches.
+  - rscadd: Physician lockers now contain HUDpatches.
   - rscadd: Chest-rigs and Paramedic jackets can now hold blood bags.
 2019-11-03:
   Geeves:
diff --git a/html/changelogs/mattatlas-medbayreshuffle.yml b/html/changelogs/mattatlas-medbayreshuffle.yml
new file mode 100644
index 00000000000..9dcae14fc2b
--- /dev/null
+++ b/html/changelogs/mattatlas-medbayreshuffle.yml
@@ -0,0 +1,43 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.  
+author: MattAtlas
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - experiment: "The Medical Doctor role has been split up into two different roles."
+  - tweak: "Medical Doctor is now renamed to Physician and has four slots."
+  - rscadd: "Surgeon is now its own standalone role. Two slots."
diff --git a/maps/aurora/aurora-3_sublevel.dmm b/maps/aurora/aurora-3_sublevel.dmm
index 0ca5f9f6451..cefb9729014 100644
--- a/maps/aurora/aurora-3_sublevel.dmm
+++ b/maps/aurora/aurora-3_sublevel.dmm
@@ -24728,7 +24728,7 @@
 	dir = 1
 	},
 /obj/effect/landmark/start{
-	name = "Medical Doctor"
+	name = "Physician"
 	},
 /obj/effect/floor_decal/corner/lime{
 	icon_state = "corner_white";
@@ -24741,7 +24741,7 @@
 	dir = 1
 	},
 /obj/effect/landmark/start{
-	name = "Medical Doctor"
+	name = "Physician"
 	},
 /obj/effect/floor_decal/corner/lime/diagonal,
 /turf/simulated/floor/tiled/white,
@@ -24751,7 +24751,7 @@
 	dir = 1
 	},
 /obj/effect/landmark/start{
-	name = "Medical Doctor"
+	name = "Physician"
 	},
 /obj/effect/floor_decal/corner/lime{
 	dir = 6
diff --git a/maps/exodus/exodus-1_station.dmm b/maps/exodus/exodus-1_station.dmm
index 3ccf9adca87..4891b67c1a6 100644
--- a/maps/exodus/exodus-1_station.dmm
+++ b/maps/exodus/exodus-1_station.dmm
@@ -19131,7 +19131,7 @@
 	dir = 1
 	},
 /obj/effect/landmark/start{
-	name = "Medical Doctor"
+	name = "Physician"
 	},
 /turf/simulated/floor/tiled,
 /area/medical/reception)
@@ -19955,7 +19955,7 @@
 	dir = 1
 	},
 /obj/effect/landmark/start{
-	name = "Medical Doctor"
+	name = "Physician"
 	},
 /turf/simulated/floor/tiled,
 /area/medical/reception)
@@ -37223,7 +37223,7 @@
 	dir = 4
 	},
 /obj/effect/landmark/start{
-	name = "Medical Doctor"
+	name = "Physician"
 	},
 /turf/simulated/floor/tiled,
 /area/medical/exam_room)
@@ -56261,7 +56261,7 @@
 /obj/effect/floor_decal/corner/white/diagonal,
 /obj/item/stool/padded,
 /obj/effect/landmark/start{
-	name = "Medical Doctor"
+	name = "Physician"
 	},
 /turf/simulated/floor/tiled,
 /area/crew_quarters/medbreak)
@@ -59458,7 +59458,7 @@
 	},
 /obj/machinery/hologram/holopad,
 /obj/effect/landmark/start{
-	name = "Medical Doctor"
+	name = "Physician"
 	},
 /turf/simulated/floor/tiled/white,
 /area/medical/patient_wing_hallway)