diff -u -r1.3 RoleBlockPlugin.inc.php
--- plugins/blocks/role/RoleBlockPlugin.inc.php	4 Apr 2008 17:06:51 -0000	1.3
+++ plugins/blocks/role/RoleBlockPlugin.inc.php	18 Jun 2008 15:58:32 -0000
@@ -38,7 +38,7 @@
 	 * Install default settings on journal creation.
 	 * @return string
 	 */
-	function getNewJournalPluginSettingsFile() {
+	function getNewConferencePluginSettingsFile() {
 		return $this->getPluginPath() . '/settings.xml';
 	}
 
diff -u -r1.6 TinyMCEPlugin.inc.php
--- plugins/generic/tinymce/TinyMCEPlugin.inc.php	6 Jun 2008 19:54:19 -0000	1.6
+++ plugins/generic/tinymce/TinyMCEPlugin.inc.php	18 Jun 2008 15:58:33 -0000
@@ -22,7 +22,7 @@
 class TinyMCEPlugin extends GenericPlugin {
 	/**
 	 * Register the plugin, if enabled; note that this plugin
-	 * runs under both Journal and Site contexts.
+	 * runs under both Conference and Site contexts.
 	 * @param $category string
 	 * @param $path string
 	 * @return boolean