diff --git a/code/__HELPERS/roundend.dm b/code/__HELPERS/roundend.dm
index 19ee2b2a5a..3f33214668 100644
--- a/code/__HELPERS/roundend.dm
+++ b/code/__HELPERS/roundend.dm
@@ -139,19 +139,19 @@
 	var/list/file_data = list()
 	var/pos = 1
 	for(var/V in GLOB.news_network.network_channels)
-		var/datum/newscaster/feed_channel/channel = V
+		var/datum/news/feed_channel/channel = V
 		if(!istype(channel))
 			stack_trace("Non-channel in newscaster channel list")
 			continue
 		file_data["[pos]"] = list("channel name" = "[channel.channel_name]", "author" = "[channel.author]", "censored" = channel.censored ? 1 : 0, "author censored" = channel.authorCensor ? 1 : 0, "messages" = list())
 		for(var/M in channel.messages)
-			var/datum/newscaster/feed_message/message = M
+			var/datum/news/feed_message/message = M
 			if(!istype(message))
 				stack_trace("Non-message in newscaster channel messages list")
 				continue
 			var/list/comment_data = list()
 			for(var/C in message.comments)
-				var/datum/newscaster/feed_comment/comment = C
+				var/datum/news/feed_comment/comment = C
 				if(!istype(comment))
 					stack_trace("Non-message in newscaster message comments list")
 					continue
diff --git a/code/game/objects/items/devices/PDA/cart.dm b/code/game/objects/items/devices/PDA/cart.dm
index b186c29539..7b66f68a79 100644
--- a/code/game/objects/items/devices/PDA/cart.dm
+++ b/code/game/objects/items/devices/PDA/cart.dm
@@ -562,22 +562,22 @@ Code:
 		if (53) // Newscaster
 			menu = "<h4>[PDAIMG(notes)] Newscaster Access</h4>"
 			menu += "<br> Current Newsfeed: <A href='byond://?src=[REF(src)];choice=Newscaster Switch Channel'>[current_channel ? current_channel : "None"]</a> <br>"
-			var/datum/newscaster/feed_channel/current
-			for(var/datum/newscaster/feed_channel/chan in GLOB.news_network.network_channels)
+			var/datum/news/feed_channel/current
+			for(var/datum/news/feed_channel/chan in GLOB.news_network.network_channels)
 				if (chan.channel_name == current_channel)
 					current = chan
 			if(!current)
 				menu += "<h5> ERROR : NO CHANNEL FOUND </h5>"
 				return
 			var/i = 1
-			for(var/datum/newscaster/feed_message/msg in current.messages)
+			for(var/datum/news/feed_message/msg in current.messages)
 				menu +="-[msg.returnBody(-1)] <BR><FONT SIZE=1>\[Story by <FONT COLOR='maroon'>[msg.returnAuthor(-1)]</FONT>\]</FONT><BR>"
 				menu +="<b><font size=1>[msg.comments.len] comment[msg.comments.len > 1 ? "s" : ""]</font></b><br>"
 				if(msg.img)
 					user << browse_rsc(msg.img, "tmp_photo[i].png")
 					menu +="<img src='tmp_photo[i].png' width = '180'><BR>"
 				i++
-				for(var/datum/newscaster/feed_comment/comment in msg.comments)
+				for(var/datum/news/feed_comment/comment in msg.comments)
 					menu +="<font size=1><small>[comment.body]</font><br><font size=1><small><small><small>[comment.author] [comment.time_stamp]</small></small></small></small></font><br>"
 			menu += "<br> <A href='byond://?src=[REF(src)];choice=Newscaster Message'>Post Message</a>"
 
@@ -681,8 +681,8 @@ Code:
 		if("Newscaster Message")
 			var/host_pda_owner_name = host_pda.id ? "[host_pda.id.registered_name] ([host_pda.id.assignment])" : "Unknown"
 			var/message = host_pda.msg_input()
-			var/datum/newscaster/feed_channel/current
-			for(var/datum/newscaster/feed_channel/chan in GLOB.news_network.network_channels)
+			var/datum/news/feed_channel/current
+			for(var/datum/news/feed_channel/chan in GLOB.news_network.network_channels)
 				if (chan.channel_name == current_channel)
 					current = chan
 			if(current.locked && current.author != host_pda_owner_name)
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index 372902e8d6..bb0224bbfc 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -240,7 +240,7 @@
 			if( isemptylist(GLOB.news_network.network_channels) )
 				dat+="<I>No active channels found...</I>"
 			else
-				for(var/datum/newscaster/feed_channel/CHANNEL in GLOB.news_network.network_channels)
+				for(var/datum/news/feed_channel/CHANNEL in GLOB.news_network.network_channels)
 					if(CHANNEL.is_admin_channel)
 						dat+="<B><FONT style='BACKGROUND-COLOR: LightGreen'><A href='?src=[REF(src)];ac_show_channel=[REF(CHANNEL)]'>[CHANNEL.channel_name]</A></FONT></B><BR>"
 					else
@@ -277,7 +277,7 @@
 			if(src.admincaster_feed_channel.channel_name =="" || src.admincaster_feed_channel.channel_name == "\[REDACTED\]")
 				dat+="<FONT COLOR='maroon'>•Invalid channel name.</FONT><BR>"
 			var/check = 0
-			for(var/datum/newscaster/feed_channel/FC in GLOB.news_network.network_channels)
+			for(var/datum/news/feed_channel/FC in GLOB.news_network.network_channels)
 				if(FC.channel_name == src.admincaster_feed_channel.channel_name)
 					check = 1
 					break
@@ -294,7 +294,7 @@
 					dat+="<I>No feed messages found in channel...</I><BR>"
 				else
 					var/i = 0
-					for(var/datum/newscaster/feed_message/MESSAGE in src.admincaster_feed_channel.messages)
+					for(var/datum/news/feed_message/MESSAGE in src.admincaster_feed_channel.messages)
 						i++
 						dat+="-[MESSAGE.returnBody(-1)] <BR>"
 						if(MESSAGE.img)
@@ -302,7 +302,7 @@
 							dat+="<img src='tmp_photo[i].png' width = '180'><BR><BR>"
 						dat+="<FONT SIZE=1>\[Story by <FONT COLOR='maroon'>[MESSAGE.returnAuthor(-1)]</FONT>\]</FONT><BR>"
 						dat+="[MESSAGE.comments.len] comment[MESSAGE.comments.len > 1 ? "s" : ""]:<br>"
-						for(var/datum/newscaster/feed_comment/comment in MESSAGE.comments)
+						for(var/datum/news/feed_comment/comment in MESSAGE.comments)
 							dat+="[comment.body]<br><font size=1>[comment.author] [comment.time_stamp]</font><br>"
 						dat+="<br>"
 			dat+="<BR><HR><A href='?src=[REF(src)];[HrefToken()];ac_refresh=1'>Refresh</A>"
@@ -315,7 +315,7 @@
 			if(isemptylist(GLOB.news_network.network_channels))
 				dat+="<I>No feed channels found active...</I><BR>"
 			else
-				for(var/datum/newscaster/feed_channel/CHANNEL in GLOB.news_network.network_channels)
+				for(var/datum/news/feed_channel/CHANNEL in GLOB.news_network.network_channels)
 					dat+="<A href='?src=[REF(src)];[HrefToken()];ac_pick_censor_channel=[REF(CHANNEL)]'>[CHANNEL.channel_name]</A> [(CHANNEL.censored) ? ("<FONT COLOR='red'>***</FONT>") : ""]<BR>"
 			dat+="<BR><A href='?src=[REF(src)];[HrefToken()];ac_setScreen=[0]'>Cancel</A>"
 		if(11)
@@ -326,7 +326,7 @@
 			if(isemptylist(GLOB.news_network.network_channels))
 				dat+="<I>No feed channels found active...</I><BR>"
 			else
-				for(var/datum/newscaster/feed_channel/CHANNEL in GLOB.news_network.network_channels)
+				for(var/datum/news/feed_channel/CHANNEL in GLOB.news_network.network_channels)
 					dat+="<A href='?src=[REF(src)];[HrefToken()];ac_pick_d_notice=[REF(CHANNEL)]'>[CHANNEL.channel_name]</A> [(CHANNEL.censored) ? ("<FONT COLOR='red'>***</FONT>") : ""]<BR>"
 
 			dat+="<BR><A href='?src=[REF(src)];[HrefToken()];ac_setScreen=[0]'>Back</A>"
@@ -337,11 +337,11 @@
 			if( isemptylist(src.admincaster_feed_channel.messages) )
 				dat+="<I>No feed messages found in channel...</I><BR>"
 			else
-				for(var/datum/newscaster/feed_message/MESSAGE in src.admincaster_feed_channel.messages)
+				for(var/datum/news/feed_message/MESSAGE in src.admincaster_feed_channel.messages)
 					dat+="-[MESSAGE.returnBody(-1)] <BR><FONT SIZE=1>\[Story by <FONT COLOR='maroon'>[MESSAGE.returnAuthor(-1)]</FONT>\]</FONT><BR>"
 					dat+="<FONT SIZE=2><A href='?src=[REF(src)];[HrefToken()];ac_censor_channel_story_body=[REF(MESSAGE)]'>[(MESSAGE.bodyCensor) ? ("Undo story censorship") : ("Censor story")]</A>  -  <A href='?src=[REF(src)];[HrefToken()];ac_censor_channel_story_author=[REF(MESSAGE)]'>[(MESSAGE.authorCensor) ? ("Undo Author Censorship") : ("Censor message Author")]</A></FONT><BR>"
 					dat+="[MESSAGE.comments.len] comment[MESSAGE.comments.len > 1 ? "s" : ""]: <a href='?src=[REF(src)];[HrefToken()];ac_lock_comment=[REF(MESSAGE)]'>[MESSAGE.locked ? "Unlock" : "Lock"]</a><br>"
-					for(var/datum/newscaster/feed_comment/comment in MESSAGE.comments)
+					for(var/datum/news/feed_comment/comment in MESSAGE.comments)
 						dat+="[comment.body] <a href='?src=[REF(src)];[HrefToken()];ac_del_comment=[REF(comment)];ac_del_comment_msg=[REF(MESSAGE)]'>X</a><br><font size=1>[comment.author] [comment.time_stamp]</font><br>"
 			dat+="<BR><A href='?src=[REF(src)];[HrefToken()];ac_setScreen=[10]'>Back</A>"
 		if(13)
@@ -354,7 +354,7 @@
 				if( isemptylist(src.admincaster_feed_channel.messages) )
 					dat+="<I>No feed messages found in channel...</I><BR>"
 				else
-					for(var/datum/newscaster/feed_message/MESSAGE in src.admincaster_feed_channel.messages)
+					for(var/datum/news/feed_message/MESSAGE in src.admincaster_feed_channel.messages)
 						dat+="-[MESSAGE.returnBody(-1)] <BR><FONT SIZE=1>\[Story by <FONT COLOR='maroon'>[MESSAGE.returnAuthor(-1)]</FONT>\]</FONT><BR>"
 			dat+="<BR><A href='?src=[REF(src)];[HrefToken()];ac_setScreen=[11]'>Back</A>"
 		if(14)
diff --git a/code/modules/admin/holder2.dm b/code/modules/admin/holder2.dm
index 43360ad714..37fe2a41fc 100644
--- a/code/modules/admin/holder2.dm
+++ b/code/modules/admin/holder2.dm
@@ -19,9 +19,9 @@ GLOBAL_PROTECT(href_token)
 	var/spamcooldown = 0
 
 	var/admincaster_screen = 0	//TODO: remove all these 5 variables, they are completly unacceptable
-	var/datum/newscaster/feed_message/admincaster_feed_message = new /datum/newscaster/feed_message
-	var/datum/newscaster/wanted_message/admincaster_wanted_message = new /datum/newscaster/wanted_message
-	var/datum/newscaster/feed_channel/admincaster_feed_channel = new /datum/newscaster/feed_channel
+	var/datum/news/feed_message/admincaster_feed_message = new /datum/news/feed_message
+	var/datum/news/wanted_message/admincaster_wanted_message = new /datum/news/wanted_message
+	var/datum/news/feed_channel/admincaster_feed_channel = new /datum/news/feed_channel
 	var/admin_signature
 
 	var/href_token
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index 70b25bebdd..6abf2d3f1b 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -2481,7 +2481,7 @@
 		if(!check_rights(R_ADMIN))
 			return
 		var/check = 0
-		for(var/datum/newscaster/feed_channel/FC in GLOB.news_network.network_channels)
+		for(var/datum/news/feed_channel/FC in GLOB.news_network.network_channels)
 			if(FC.channel_name == src.admincaster_feed_channel.channel_name)
 				check = 1
 				break
@@ -2500,7 +2500,7 @@
 		if(!check_rights(R_ADMIN))
 			return
 		var/list/available_channels = list()
-		for(var/datum/newscaster/feed_channel/F in GLOB.news_network.network_channels)
+		for(var/datum/news/feed_channel/F in GLOB.news_network.network_channels)
 			available_channels += F.channel_name
 		src.admincaster_feed_channel.channel_name = adminscrub(input(usr, "Choose receiving Feed Channel.", "Network Channel Handler") in available_channels )
 		src.access_news_network()
@@ -2606,28 +2606,28 @@
 	else if(href_list["ac_censor_channel_author"])
 		if(!check_rights(R_ADMIN))
 			return
-		var/datum/newscaster/feed_channel/FC = locate(href_list["ac_censor_channel_author"])
+		var/datum/news/feed_channel/FC = locate(href_list["ac_censor_channel_author"])
 		FC.toggleCensorAuthor()
 		src.access_news_network()
 
 	else if(href_list["ac_censor_channel_story_author"])
 		if(!check_rights(R_ADMIN))
 			return
-		var/datum/newscaster/feed_message/MSG = locate(href_list["ac_censor_channel_story_author"])
+		var/datum/news/feed_message/MSG = locate(href_list["ac_censor_channel_story_author"])
 		MSG.toggleCensorAuthor()
 		src.access_news_network()
 
 	else if(href_list["ac_censor_channel_story_body"])
 		if(!check_rights(R_ADMIN))
 			return
-		var/datum/newscaster/feed_message/MSG = locate(href_list["ac_censor_channel_story_body"])
+		var/datum/news/feed_message/MSG = locate(href_list["ac_censor_channel_story_body"])
 		MSG.toggleCensorBody()
 		src.access_news_network()
 
 	else if(href_list["ac_pick_d_notice"])
 		if(!check_rights(R_ADMIN))
 			return
-		var/datum/newscaster/feed_channel/FC = locate(href_list["ac_pick_d_notice"])
+		var/datum/news/feed_channel/FC = locate(href_list["ac_pick_d_notice"])
 		src.admincaster_feed_channel = FC
 		src.admincaster_screen=13
 		src.access_news_network()
@@ -2635,7 +2635,7 @@
 	else if(href_list["ac_toggle_d_notice"])
 		if(!check_rights(R_ADMIN))
 			return
-		var/datum/newscaster/feed_channel/FC = locate(href_list["ac_toggle_d_notice"])
+		var/datum/news/feed_channel/FC = locate(href_list["ac_toggle_d_notice"])
 		FC.toggleCensorDclass()
 		src.access_news_network()
 
@@ -2651,17 +2651,17 @@
 		src.admincaster_screen = text2num(href_list["ac_setScreen"])
 		if (src.admincaster_screen == 0)
 			if(src.admincaster_feed_channel)
-				src.admincaster_feed_channel = new /datum/newscaster/feed_channel
+				src.admincaster_feed_channel = new /datum/news/feed_channel
 			if(src.admincaster_feed_message)
-				src.admincaster_feed_message = new /datum/newscaster/feed_message
+				src.admincaster_feed_message = new /datum/news/feed_message
 			if(admincaster_wanted_message)
-				admincaster_wanted_message = new /datum/newscaster/wanted_message
+				admincaster_wanted_message = new /datum/news/wanted_message
 		src.access_news_network()
 
 	else if(href_list["ac_show_channel"])
 		if(!check_rights(R_ADMIN))
 			return
-		var/datum/newscaster/feed_channel/FC = locate(href_list["ac_show_channel"])
+		var/datum/news/feed_channel/FC = locate(href_list["ac_show_channel"])
 		src.admincaster_feed_channel = FC
 		src.admincaster_screen = 9
 		src.access_news_network()
@@ -2669,7 +2669,7 @@
 	else if(href_list["ac_pick_censor_channel"])
 		if(!check_rights(R_ADMIN))
 			return
-		var/datum/newscaster/feed_channel/FC = locate(href_list["ac_pick_censor_channel"])
+		var/datum/news/feed_channel/FC = locate(href_list["ac_pick_censor_channel"])
 		src.admincaster_feed_channel = FC
 		src.admincaster_screen = 12
 		src.access_news_network()
@@ -2688,8 +2688,8 @@
 	else if(href_list["ac_del_comment"])
 		if(!check_rights(R_ADMIN))
 			return
-		var/datum/newscaster/feed_comment/FC = locate(href_list["ac_del_comment"])
-		var/datum/newscaster/feed_message/FM = locate(href_list["ac_del_comment_msg"])
+		var/datum/news/feed_comment/FC = locate(href_list["ac_del_comment"])
+		var/datum/news/feed_message/FM = locate(href_list["ac_del_comment_msg"])
 		FM.comments -= FC
 		qdel(FC)
 		src.access_news_network()
@@ -2697,7 +2697,7 @@
 	else if(href_list["ac_lock_comment"])
 		if(!check_rights(R_ADMIN))
 			return
-		var/datum/newscaster/feed_message/FM = locate(href_list["ac_lock_comment"])
+		var/datum/news/feed_message/FM = locate(href_list["ac_lock_comment"])
 		FM.locked ^= 1
 		src.access_news_network()
 
diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm
index 204a2de9a6..008724b10f 100644
--- a/code/modules/library/lib_machines.dm
+++ b/code/modules/library/lib_machines.dm
@@ -441,7 +441,7 @@ GLOBAL_LIST(cachedbooks) // List of our cached book datums
 		if(!GLOB.news_network)
 			alert("No news network found on station. Aborting.")
 		var/channelexists = 0
-		for(var/datum/newscaster/feed_channel/FC in GLOB.news_network.network_channels)
+		for(var/datum/news/feed_channel/FC in GLOB.news_network.network_channels)
 			if(FC.channel_name == "Nanotrasen Book Club")
 				channelexists = 1
 				break
diff --git a/code/modules/newscaster/feed_channel.dm b/code/modules/newscaster/feed_channel.dm
index 98c8d35493..8bd639b3dc 100644
--- a/code/modules/newscaster/feed_channel.dm
+++ b/code/modules/newscaster/feed_channel.dm
@@ -1,6 +1,6 @@
-/datum/newscaster/feed_channel
+/datum/news/feed_channel
 	var/channel_name = ""
-	var/list/datum/newscaster/feed_message/messages = list()
+	var/list/datum/news/feed_message/messages = list()
 	var/locked = FALSE
 	var/author = ""
 	var/censored = 0
@@ -9,7 +9,7 @@
 	var/authorCensor
 	var/is_admin_channel = 0
 
-/datum/newscaster/feed_channel/proc/returnAuthor(censor)
+/datum/news/feed_channel/proc/returnAuthor(censor)
 	if(censor == -1)
 		censor = authorCensor
 	var/txt = "[GLOB.news_network.redactedText]"
@@ -17,7 +17,7 @@
 		txt = author
 	return txt
 
-/datum/newscaster/feed_channel/proc/toggleCensorDclass()
+/datum/news/feed_channel/proc/toggleCensorDclass()
 	if(censored)
 		DclassCensorTime.Add(GLOB.news_network.lastAction*-1)
 	else
@@ -25,7 +25,7 @@
 	censored = !censored
 	GLOB.news_network.lastAction ++
 
-/datum/newscaster/feed_channel/proc/toggleCensorAuthor()
+/datum/news/feed_channel/proc/toggleCensorAuthor()
 	if(authorCensor)
 		authorCensorTime.Add(GLOB.news_network.lastAction*-1)
 	else
diff --git a/code/modules/newscaster/feed_comment.dm b/code/modules/newscaster/feed_comment.dm
index f5f847ab8e..9eba2d73dc 100644
--- a/code/modules/newscaster/feed_comment.dm
+++ b/code/modules/newscaster/feed_comment.dm
@@ -1,4 +1,4 @@
-/datum/newscaster/feed_comment
+/datum/news/feed_comment
 	var/author = ""
 	var/body = ""
 	var/time_stamp = ""
diff --git a/code/modules/newscaster/feed_message.dm b/code/modules/newscaster/feed_message.dm
index 1930177555..f9c3da554e 100644
--- a/code/modules/newscaster/feed_message.dm
+++ b/code/modules/newscaster/feed_message.dm
@@ -1,4 +1,4 @@
-/datum/newscaster/feed_message
+/datum/news/feed_message
 	var/author =""
 	var/body =""
 	var/list/authorCensorTime = list()
@@ -6,7 +6,7 @@
 	var/is_admin_message = 0
 	var/icon/img = null
 	var/time_stamp = ""
-	var/list/datum/newscaster/feed_comment/comments = list()
+	var/list/datum/news/feed_comment/comments = list()
 	var/locked = FALSE
 	var/caption = ""
 	var/creationTime
@@ -14,7 +14,7 @@
 	var/bodyCensor
 	var/photo_file
 
-/datum/newscaster/feed_message/proc/returnAuthor(censor)
+/datum/news/feed_message/proc/returnAuthor(censor)
 	if(censor == -1)
 		censor = authorCensor
 	var/txt = "[GLOB.news_network.redactedText]"
@@ -22,7 +22,7 @@
 		txt = author
 	return txt
 
-/datum/newscaster/feed_message/proc/returnBody(censor)
+/datum/news/feed_message/proc/returnBody(censor)
 	if(censor == -1)
 		censor = bodyCensor
 	var/txt = "[GLOB.news_network.redactedText]"
@@ -30,7 +30,7 @@
 		txt = body
 	return txt
 
-/datum/newscaster/feed_message/proc/toggleCensorAuthor()
+/datum/news/feed_message/proc/toggleCensorAuthor()
 	if(authorCensor)
 		authorCensorTime.Add(GLOB.news_network.lastAction*-1)
 	else
@@ -38,7 +38,7 @@
 	authorCensor = !authorCensor
 	GLOB.news_network.lastAction ++
 
-/datum/newscaster/feed_message/proc/toggleCensorBody()
+/datum/news/feed_message/proc/toggleCensorBody()
 	if(bodyCensor)
 		bodyCensorTime.Add(GLOB.news_network.lastAction*-1)
 	else
diff --git a/code/modules/newscaster/feed_network.dm b/code/modules/newscaster/feed_network.dm
index b1e8ad19ae..5e056addee 100644
--- a/code/modules/newscaster/feed_network.dm
+++ b/code/modules/newscaster/feed_network.dm
@@ -2,17 +2,17 @@ GLOBAL_DATUM_INIT(news_network, /datum/news_network, new)
 
 /// Contains all the news datum of a newscaster system.
 /datum/news_network
-	var/list/datum/newscaster/feed_channel/network_channels = list()
-	var/datum/newscaster/wanted_message/wanted_issue
+	var/list/datum/news/feed_channel/network_channels = list()
+	var/datum/news/wanted_message/wanted_issue
 	var/lastAction
 	var/redactedText = "\[REDACTED\]"
 
 /datum/news_network/New()
 	CreateFeedChannel("Station Announcements", "SS13", 1)
-	wanted_issue = new /datum/newscaster/wanted_message
+	wanted_issue = new /datum/news/wanted_message
 
 /datum/news_network/proc/CreateFeedChannel(channel_name, author, locked, adminChannel = 0)
-	var/datum/newscaster/feed_channel/newChannel = new /datum/newscaster/feed_channel
+	var/datum/news/feed_channel/newChannel = new /datum/news/feed_channel
 	newChannel.channel_name = channel_name
 	newChannel.author = author
 	newChannel.locked = locked
@@ -20,7 +20,7 @@ GLOBAL_DATUM_INIT(news_network, /datum/news_network, new)
 	network_channels += newChannel
 
 /datum/news_network/proc/SubmitArticle(msg, author, channel_name, datum/picture/picture, adminMessage = 0, allow_comments = 1)
-	var/datum/newscaster/feed_message/newMsg = new /datum/newscaster/feed_message
+	var/datum/news/feed_message/newMsg = new /datum/news/feed_message
 	newMsg.author = author
 	newMsg.body = msg
 	newMsg.time_stamp = STATION_TIME_TIMESTAMP("hh:mm:ss", world.time)
@@ -30,7 +30,7 @@ GLOBAL_DATUM_INIT(news_network, /datum/news_network, new)
 		newMsg.img = picture.picture_image
 		newMsg.caption = picture.caption
 		newMsg.photo_file = save_photo(picture.picture_image)
-	for(var/datum/newscaster/feed_channel/FC in network_channels)
+	for(var/datum/news/feed_channel/FC in network_channels)
 		if(FC.channel_name == channel_name)
 			FC.messages += newMsg
 			break
diff --git a/code/modules/newscaster/news_datum.dm b/code/modules/newscaster/news_datum.dm
index 3c42d04734..5fcf3b4551 100644
--- a/code/modules/newscaster/news_datum.dm
+++ b/code/modules/newscaster/news_datum.dm
@@ -1 +1 @@
-/datum/newscaster
+/datum/news
diff --git a/code/modules/newscaster/newscaster.dm b/code/modules/newscaster/newscaster.dm
index e9458666f3..88379efcf8 100644
--- a/code/modules/newscaster/newscaster.dm
+++ b/code/modules/newscaster/newscaster.dm
@@ -29,7 +29,7 @@ GLOBAL_LIST_EMPTY(allCasters)
 	var/datum/picture/picture
 	var/channel_name = ""
 	var/c_locked=0
-	var/datum/newscaster/feed_channel/viewing_channel = null
+	var/datum/news/feed_channel/viewing_channel = null
 	var/allow_comments = 1
 
 /obj/machinery/newscaster/security_unit
@@ -123,7 +123,7 @@ GLOBAL_LIST_EMPTY(allCasters)
 				if( isemptylist(GLOB.news_network.network_channels) )
 					dat+="<I>No active channels found...</I>"
 				else
-					for(var/datum/newscaster/feed_channel/CHANNEL in GLOB.news_network.network_channels)
+					for(var/datum/news/feed_channel/CHANNEL in GLOB.news_network.network_channels)
 						if(CHANNEL.is_admin_channel)
 							dat+="<B><FONT style='BACKGROUND-COLOR: LightGreen '><A href='?src=[REF(src)];show_channel=[REF(CHANNEL)]'>[CHANNEL.channel_name]</A></FONT></B><BR>"
 						else
@@ -162,7 +162,7 @@ GLOBAL_LIST_EMPTY(allCasters)
 			if(7)
 				dat+="<B><FONT COLOR='maroon'>ERROR: Could not submit Feed Channel to Network.</B></FONT><HR><BR>"
 				var/list/existing_authors = list()
-				for(var/datum/newscaster/feed_channel/FC in GLOB.news_network.network_channels)
+				for(var/datum/news/feed_channel/FC in GLOB.news_network.network_channels)
 					if(FC.authorCensor)
 						existing_authors += GLOB.news_network.redactedText
 					else
@@ -172,7 +172,7 @@ GLOBAL_LIST_EMPTY(allCasters)
 				if(channel_name=="" || channel_name == "\[REDACTED\]")
 					dat+="<FONT COLOR='maroon'>Invalid channel name.</FONT><BR>"
 				var/check = 0
-				for(var/datum/newscaster/feed_channel/FC in GLOB.news_network.network_channels)
+				for(var/datum/news/feed_channel/FC in GLOB.news_network.network_channels)
 					if(FC.channel_name == channel_name)
 						check = 1
 						break
@@ -185,7 +185,7 @@ GLOBAL_LIST_EMPTY(allCasters)
 				var/total_num=length(GLOB.news_network.network_channels)
 				var/active_num=total_num
 				var/message_num=0
-				for(var/datum/newscaster/feed_channel/FC in GLOB.news_network.network_channels)
+				for(var/datum/news/feed_channel/FC in GLOB.news_network.network_channels)
 					if(!FC.censored)
 						message_num += length(FC.messages)
 					else
@@ -204,7 +204,7 @@ GLOBAL_LIST_EMPTY(allCasters)
 						dat+="<I>No feed messages found in channel...</I><BR>"
 					else
 						var/i = 0
-						for(var/datum/newscaster/feed_message/MESSAGE in viewing_channel.messages)
+						for(var/datum/news/feed_message/MESSAGE in viewing_channel.messages)
 							i++
 							dat+="-[MESSAGE.returnBody(-1)] <BR>"
 							if(MESSAGE.img)
@@ -215,7 +215,7 @@ GLOBAL_LIST_EMPTY(allCasters)
 								dat+="<BR>"
 							dat+="<FONT SIZE=1>\[Story by <FONT COLOR='maroon'>[MESSAGE.returnAuthor(-1)] </FONT>\] - ([MESSAGE.time_stamp])</FONT><BR>"
 							dat+="<b><font size=1>[MESSAGE.comments.len] comment[MESSAGE.comments.len > 1 ? "s" : ""]</font></b><br>"
-							for(var/datum/newscaster/feed_comment/comment in MESSAGE.comments)
+							for(var/datum/news/feed_comment/comment in MESSAGE.comments)
 								dat+="<font size=1><small>[comment.body]</font><br><font size=1><small><small><small>[comment.author] [comment.time_stamp]</small></small></small></small></font><br>"
 							if(MESSAGE.locked)
 								dat+="<b>Comments locked</b><br>"
@@ -231,7 +231,7 @@ GLOBAL_LIST_EMPTY(allCasters)
 				if(isemptylist(GLOB.news_network.network_channels))
 					dat+="<I>No feed channels found active...</I><BR>"
 				else
-					for(var/datum/newscaster/feed_channel/CHANNEL in GLOB.news_network.network_channels)
+					for(var/datum/news/feed_channel/CHANNEL in GLOB.news_network.network_channels)
 						dat+="<A href='?src=[REF(src)];pick_censor_channel=[REF(CHANNEL)]'>[CHANNEL.channel_name]</A> [(CHANNEL.censored) ? ("<FONT COLOR='red'>***</FONT>") : ""]<BR>"
 				dat+="<BR><A href='?src=[REF(src)];setScreen=[0]'>Cancel</A>"
 			if(11)
@@ -242,7 +242,7 @@ GLOBAL_LIST_EMPTY(allCasters)
 				if(isemptylist(GLOB.news_network.network_channels))
 					dat+="<I>No feed channels found active...</I><BR>"
 				else
-					for(var/datum/newscaster/feed_channel/CHANNEL in GLOB.news_network.network_channels)
+					for(var/datum/news/feed_channel/CHANNEL in GLOB.news_network.network_channels)
 						dat+="<A href='?src=[REF(src)];pick_d_notice=[REF(CHANNEL)]'>[CHANNEL.channel_name]</A> [(CHANNEL.censored) ? ("<FONT COLOR='red'>***</FONT>") : ""]<BR>"
 				dat+="<BR><A href='?src=[REF(src)];setScreen=[0]'>Back</A>"
 			if(12)
@@ -251,11 +251,11 @@ GLOBAL_LIST_EMPTY(allCasters)
 				if(isemptylist(viewing_channel.messages))
 					dat+="<I>No feed messages found in channel...</I><BR>"
 				else
-					for(var/datum/newscaster/feed_message/MESSAGE in viewing_channel.messages)
+					for(var/datum/news/feed_message/MESSAGE in viewing_channel.messages)
 						dat+="-[MESSAGE.returnBody(-1)] <BR><FONT SIZE=1>\[Story by <FONT COLOR='maroon'>[MESSAGE.returnAuthor(-1)]</FONT>\]</FONT><BR>"
 						dat+="<FONT SIZE=2><A href='?src=[REF(src)];censor_channel_story_body=[REF(MESSAGE)]'>[(MESSAGE.bodyCensor) ? ("Undo story censorship") : ("Censor story")]</A>  -  <A href='?src=[REF(src)];censor_channel_story_author=[REF(MESSAGE)]'>[(MESSAGE.authorCensor) ? ("Undo Author Censorship") : ("Censor message Author")]</A></FONT><BR>"
 						dat+="[MESSAGE.comments.len] comment[MESSAGE.comments.len > 1 ? "s" : ""]: <a href='?src=[REF(src)];lock_comment=[REF(MESSAGE)]'>[MESSAGE.locked ? "Unlock" : "Lock"]</a><br>"
-						for(var/datum/newscaster/feed_comment/comment in MESSAGE.comments)
+						for(var/datum/news/feed_comment/comment in MESSAGE.comments)
 							dat+="[comment.body] <a href='?src=[REF(src)];del_comment=[REF(comment)];del_comment_msg=[REF(MESSAGE)]'>X</a><br><font size=1>[comment.author] [comment.time_stamp]</font><br>"
 				dat+="<BR><A href='?src=[REF(src)];setScreen=[10]'>Back</A>"
 			if(13)
@@ -268,7 +268,7 @@ GLOBAL_LIST_EMPTY(allCasters)
 					if(isemptylist(viewing_channel.messages))
 						dat+="<I>No feed messages found in channel...</I><BR>"
 					else
-						for(var/datum/newscaster/feed_message/MESSAGE in viewing_channel.messages)
+						for(var/datum/news/feed_message/MESSAGE in viewing_channel.messages)
 							dat+="-[MESSAGE.returnBody(-1)] <BR><FONT SIZE=1>\[Story by <FONT COLOR='maroon'>[MESSAGE.returnAuthor(-1)]</FONT>\]</FONT><BR>"
 				dat+="<BR><A href='?src=[REF(src)];setScreen=[11]'>Back</A>"
 			if(14)
@@ -349,13 +349,13 @@ GLOBAL_LIST_EMPTY(allCasters)
 			updateUsrDialog()
 		else if(href_list["submit_new_channel"])
 			var/list/existing_authors = list()
-			for(var/datum/newscaster/feed_channel/FC in GLOB.news_network.network_channels)
+			for(var/datum/news/feed_channel/FC in GLOB.news_network.network_channels)
 				if(FC.authorCensor)
 					existing_authors += GLOB.news_network.redactedText
 				else
 					existing_authors += FC.author
 			var/check = 0
-			for(var/datum/newscaster/feed_channel/FC in GLOB.news_network.network_channels)
+			for(var/datum/news/feed_channel/FC in GLOB.news_network.network_channels)
 				if(FC.channel_name == channel_name)
 					check = 1
 					break
@@ -371,7 +371,7 @@ GLOBAL_LIST_EMPTY(allCasters)
 			updateUsrDialog()
 		else if(href_list["set_channel_receiving"])
 			var/list/available_channels = list()
-			for(var/datum/newscaster/feed_channel/F in GLOB.news_network.network_channels)
+			for(var/datum/news/feed_channel/F in GLOB.news_network.network_channels)
 				if( (!F.locked || F.author == scanned_user) && !F.censored)
 					available_channels += F.channel_name
 			channel_name = input(usr, "Choose receiving Feed Channel", "Network Channel Handler") in available_channels
@@ -461,33 +461,33 @@ GLOBAL_LIST_EMPTY(allCasters)
 			screen=18
 			updateUsrDialog()
 		else if(href_list["censor_channel_author"])
-			var/datum/newscaster/feed_channel/FC = locate(href_list["censor_channel_author"])
+			var/datum/news/feed_channel/FC = locate(href_list["censor_channel_author"])
 			if(FC.is_admin_channel)
 				alert("This channel was created by a Nanotrasen Officer. You cannot censor it.","Ok")
 				return
 			FC.toggleCensorAuthor()
 			updateUsrDialog()
 		else if(href_list["censor_channel_story_author"])
-			var/datum/newscaster/feed_message/MSG = locate(href_list["censor_channel_story_author"])
+			var/datum/news/feed_message/MSG = locate(href_list["censor_channel_story_author"])
 			if(MSG.is_admin_message)
 				alert("This message was created by a Nanotrasen Officer. You cannot censor its author.","Ok")
 				return
 			MSG.toggleCensorAuthor()
 			updateUsrDialog()
 		else if(href_list["censor_channel_story_body"])
-			var/datum/newscaster/feed_message/MSG = locate(href_list["censor_channel_story_body"])
+			var/datum/news/feed_message/MSG = locate(href_list["censor_channel_story_body"])
 			if(MSG.is_admin_message)
 				alert("This channel was created by a Nanotrasen Officer. You cannot censor it.","Ok")
 				return
 			MSG.toggleCensorBody()
 			updateUsrDialog()
 		else if(href_list["pick_d_notice"])
-			var/datum/newscaster/feed_channel/FC = locate(href_list["pick_d_notice"])
+			var/datum/news/feed_channel/FC = locate(href_list["pick_d_notice"])
 			viewing_channel = FC
 			screen=13
 			updateUsrDialog()
 		else if(href_list["toggle_d_notice"])
-			var/datum/newscaster/feed_channel/FC = locate(href_list["toggle_d_notice"])
+			var/datum/news/feed_channel/FC = locate(href_list["toggle_d_notice"])
 			if(FC.is_admin_channel)
 				alert("This channel was created by a Nanotrasen Officer. You cannot place a D-Notice upon it.","Ok")
 				return
@@ -506,21 +506,21 @@ GLOBAL_LIST_EMPTY(allCasters)
 				viewing_channel = null
 			updateUsrDialog()
 		else if(href_list["show_channel"])
-			var/datum/newscaster/feed_channel/FC = locate(href_list["show_channel"])
+			var/datum/news/feed_channel/FC = locate(href_list["show_channel"])
 			viewing_channel = FC
 			screen = 9
 			updateUsrDialog()
 		else if(href_list["pick_censor_channel"])
-			var/datum/newscaster/feed_channel/FC = locate(href_list["pick_censor_channel"])
+			var/datum/news/feed_channel/FC = locate(href_list["pick_censor_channel"])
 			viewing_channel = FC
 			screen = 12
 			updateUsrDialog()
 		else if(href_list["new_comment"])
-			var/datum/newscaster/feed_message/FM = locate(href_list["new_comment"])
+			var/datum/news/feed_message/FM = locate(href_list["new_comment"])
 			var/cominput = copytext_char(stripped_input(usr, "Write your message:", "New comment", null), 140)
 			if(cominput)
 				scan_user(usr)
-				var/datum/newscaster/feed_comment/FC = new/datum/newscaster/feed_comment
+				var/datum/news/feed_comment/FC = new/datum/news/feed_comment
 				FC.author = scanned_user
 				FC.body = cominput
 				FC.time_stamp = STATION_TIME_TIMESTAMP("hh:mm:ss", world.time)
@@ -528,14 +528,14 @@ GLOBAL_LIST_EMPTY(allCasters)
 				usr.log_message("(as [scanned_user]) commented on message [FM.returnBody(-1)] -- [FC.body]", LOG_COMMENT)
 			updateUsrDialog()
 		else if(href_list["del_comment"])
-			var/datum/newscaster/feed_comment/FC = locate(href_list["del_comment"])
-			var/datum/newscaster/feed_message/FM = locate(href_list["del_comment_msg"])
+			var/datum/news/feed_comment/FC = locate(href_list["del_comment"])
+			var/datum/news/feed_message/FM = locate(href_list["del_comment_msg"])
 			if(istype(FC) && istype(FM))
 				FM.comments -= FC
 				qdel(FC)
 				updateUsrDialog()
 		else if(href_list["lock_comment"])
-			var/datum/newscaster/feed_message/FM = locate(href_list["lock_comment"])
+			var/datum/news/feed_message/FM = locate(href_list["lock_comment"])
 			FM.locked ^= 1
 			updateUsrDialog()
 		else if(href_list["set_comment"])
@@ -660,7 +660,7 @@ GLOBAL_LIST_EMPTY(allCasters)
 /obj/machinery/newscaster/proc/print_paper()
 	SSblackbox.record_feedback("amount", "newspapers_printed", 1)
 	var/obj/item/newspaper/NEWSPAPER = new /obj/item/newspaper
-	for(var/datum/newscaster/feed_channel/FC in GLOB.news_network.network_channels)
+	for(var/datum/news/feed_channel/FC in GLOB.news_network.network_channels)
 		NEWSPAPER.news_content += FC
 	if(GLOB.news_network.wanted_issue.active)
 		NEWSPAPER.wantedAuthor = GLOB.news_network.wanted_issue.scannedUser
@@ -701,7 +701,7 @@ GLOBAL_LIST_EMPTY(allCasters)
 	var/screen = 0
 	var/pages = 0
 	var/curr_page = 0
-	var/list/datum/newscaster/feed_channel/news_content = list()
+	var/list/datum/news/feed_channel/news_content = list()
 	var/scribble=""
 	var/scribble_page = null
 	var/wantedAuthor
@@ -737,12 +737,12 @@ GLOBAL_LIST_EMPTY(allCasters)
 						dat+="<I>Other than the title, the rest of the newspaper is unprinted...</I>"
 				else
 					dat+="Contents:<BR><ul>"
-					for(var/datum/newscaster/feed_channel/NP in news_content)
+					for(var/datum/news/feed_channel/NP in news_content)
 						pages++
 					if(wantedAuthor)
 						dat+="<B><FONT COLOR='red'>**</FONT>Important Security Announcement<FONT COLOR='red'>**</FONT></B> <FONT SIZE=2>\[page [pages+2]\]</FONT><BR>"
 					var/temp_page=0
-					for(var/datum/newscaster/feed_channel/NP in news_content)
+					for(var/datum/news/feed_channel/NP in news_content)
 						temp_page++
 						dat+="<B>[NP.channel_name]</B> <FONT SIZE=2>\[page [temp_page+1]\]</FONT><BR>"
 					dat+="</ul>"
@@ -750,9 +750,9 @@ GLOBAL_LIST_EMPTY(allCasters)
 					dat+="<BR><I>There is a small scribble near the end of this page... It reads: \"[scribble]\"</I>"
 				dat+= "<HR><DIV STYLE='float:right;'><A href='?src=[REF(src)];next_page=1'>Next Page</A></DIV> <div style='float:left;'><A href='?src=[REF(human_user)];mach_close=newspaper_main'>Done reading</A></DIV>"
 			if(1) // X channel pages inbetween.
-				for(var/datum/newscaster/feed_channel/NP in news_content)
+				for(var/datum/news/feed_channel/NP in news_content)
 					pages++
-				var/datum/newscaster/feed_channel/C = news_content[curr_page]
+				var/datum/news/feed_channel/C = news_content[curr_page]
 				dat += "<FONT SIZE=4><B>[C.channel_name]</B></FONT><FONT SIZE=1> \[created by: <FONT COLOR='maroon'>[C.returnAuthor(notContent(C.authorCensorTime))]</FONT>\]</FONT><BR><BR>"
 				if(notContent(C.DclassCensorTime))
 					dat+="This channel was deemed dangerous to the general welfare of the station and therefore marked with a <B><FONT COLOR='red'>D-Notice</B></FONT>. Its contents were not transferred to the newspaper at the time of printing."
@@ -761,7 +761,7 @@ GLOBAL_LIST_EMPTY(allCasters)
 						dat+="No Feed stories stem from this channel..."
 					else
 						var/i = 0
-						for(var/datum/newscaster/feed_message/MESSAGE in C.messages)
+						for(var/datum/news/feed_message/MESSAGE in C.messages)
 							if(MESSAGE.creationTime > creationTime)
 								if(i == 0)
 									dat+="No Feed stories stem from this channel..."
@@ -779,7 +779,7 @@ GLOBAL_LIST_EMPTY(allCasters)
 					dat+="<BR><I>There is a small scribble near the end of this page... It reads: \"[scribble]\"</I>"
 				dat+= "<BR><HR><DIV STYLE='float:left;'><A href='?src=[REF(src)];prev_page=1'>Previous Page</A></DIV> <DIV STYLE='float:right;'><A href='?src=[REF(src)];next_page=1'>Next Page</A></DIV>"
 			if(2) //Last page
-				for(var/datum/newscaster/feed_channel/NP in news_content)
+				for(var/datum/news/feed_channel/NP in news_content)
 					pages++
 				if(wantedAuthor!=null)
 					dat+="<DIV STYLE='float:center;'><FONT SIZE=4><B>Wanted Issue:</B></FONT SIZE></DIV><BR><BR>"
diff --git a/code/modules/newscaster/wanted_message.dm b/code/modules/newscaster/wanted_message.dm
index de67bbeaf5..58eb234f02 100644
--- a/code/modules/newscaster/wanted_message.dm
+++ b/code/modules/newscaster/wanted_message.dm
@@ -1,4 +1,4 @@
-/datum/newscaster/wanted_message
+/datum/news/wanted_message
 	var/active
 	var/criminal
 	var/body