diff --git a/CMakeLists.txt b/CMakeLists.txt
index a34f525..7a3e1f0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,7 +12,7 @@ if (PostgreSQL_FOUND)
     link_directories(${PostgreSQL_LIBRARY_DIRS})
 
 
-    bro_plugin_begin(Bro PostgreSQL)
+    bro_plugin_begin(Johanna PostgreSQL)
     bro_plugin_cc(src/PostgresWriter.cc)
     bro_plugin_cc(src/PostgresReader.cc)
     bro_plugin_cc(src/Plugin.cc)
diff --git a/README b/README
index 9623993..ee07121 100644
--- a/README
+++ b/README
@@ -23,8 +23,8 @@ If PostgreSQL is installed in a non-standard location, add
 ``--with-postgresql=<postgresql-base-directory`` to the ``configure`` command.
 If everything built and installed correctly, you should see this::
 
-    # bro -N Bro::PostgreSQL
-    Bro::PostgreSQL - PostgreSQL log writer and input reader (dynamic, version 0.1)
+    # bro -N Johanna::PostgreSQL
+    Johanna::PostgreSQL - PostgreSQL log writer and input reader (dynamic, version 0.1)
 
 Usage
 -----
diff --git a/scripts/Bro/PostgreSQL/__load__.bro b/scripts/0xxon/PostgreSQL/__load__.bro
similarity index 100%
rename from scripts/Bro/PostgreSQL/__load__.bro
rename to scripts/0xxon/PostgreSQL/__load__.bro
diff --git a/src/Plugin.cc b/src/Plugin.cc
index fc2e218..ccf6e24 100644
--- a/src/Plugin.cc
+++ b/src/Plugin.cc
@@ -13,7 +13,7 @@ plugin::Configuration Plugin::Configure()
 	AddComponent(new ::input::Component("PostgreSQL", ::input::reader::PostgreSQL::Instantiate));
 
 	plugin::Configuration config;
-	config.name = "Bro::PostgreSQL";
+	config.name = "Johanna::PostgreSQL";
 	config.description = "PostgreSQL log writer and input reader";
 	config.version.major = 0;
 	config.version.minor = 2;
diff --git a/tests/Baseline/postgres.show-plugin/output b/tests/Baseline/postgres.show-plugin/output
index b2e60ff..86aafc0 100644
--- a/tests/Baseline/postgres.show-plugin/output
+++ b/tests/Baseline/postgres.show-plugin/output
@@ -1,4 +1,4 @@
-Bro::PostgreSQL - PostgreSQL log writer and input reader (dynamic, version 0.1)
+Johanna::PostgreSQL - PostgreSQL log writer and input reader (dynamic, version 0.2)
     [Writer] PostgreSQL (Log::WRITER_POSTGRESQL)
     [Reader] PostgreSQL (Input::READER_POSTGRESQL)
     [Constant] LogPostgres::default_hostname
diff --git a/tests/postgres/show-plugin.bro b/tests/postgres/show-plugin.bro
index af38418..756a2a2 100644
--- a/tests/postgres/show-plugin.bro
+++ b/tests/postgres/show-plugin.bro
@@ -1,2 +1,2 @@
-# @TEST-EXEC: bro -NN Bro::PostgreSQL >output
+# @TEST-EXEC: bro -NN Johanna::PostgreSQL >output
 # @TEST-EXEC: btest-diff output