diff --git a/Base/res/devel/templates/cpp-library.postcreate b/Base/res/devel/templates/cpp-library.postcreate
index af1aee3a2d..34c8e8d82c 100644
--- a/Base/res/devel/templates/cpp-library.postcreate
+++ b/Base/res/devel/templates/cpp-library.postcreate
@@ -4,6 +4,10 @@
 # $2: Project full path
 # $3: Project name, namespace safe
 
+# FIXME: Use a single sed command once we support that.
+sed -i "s/\\\$LibName/$3/g" $2/Class1.h
+sed -i "s/\\\$LibName/$3/g" $2/Class1.cpp
+
 # Generate Makefile
 echo > $2/Makefile <<-EOF
 LIBRARY = $1.so
@@ -22,34 +26,3 @@ clean:
 	rm \$(OBJS) \$(LIBRARY)
 
 EOF
-
-# Generate 'Class1' header file
-echo > $2/Class1.h <<-EOF
-#pragma once
-
-namespace $3 {
-
-class Class1 {
-public:
-    void hello();
-};
-
-}
-
-EOF
-
-# Generate 'Class1' source file
-echo > $2/Class1.cpp <<-EOF
-#include "Class1.h"
-#include <stdio.h>
-
-namespace $3 {
-
-void Class1::hello()
-{
-    printf("Hello friends! :^)\\n");
-}
-
-}
-
-EOF
diff --git a/Base/res/devel/templates/cpp-library/Class1.cpp b/Base/res/devel/templates/cpp-library/Class1.cpp
new file mode 100644
index 0000000000..b858db0082
--- /dev/null
+++ b/Base/res/devel/templates/cpp-library/Class1.cpp
@@ -0,0 +1,11 @@
+#include "Class1.h"
+#include <AK/Format.h>
+
+namespace $LibName {
+
+void Class1::hello()
+{
+    out("Hello friends! :^)\n");
+}
+
+}
diff --git a/Base/res/devel/templates/cpp-library/Class1.h b/Base/res/devel/templates/cpp-library/Class1.h
new file mode 100644
index 0000000000..587c9623e2
--- /dev/null
+++ b/Base/res/devel/templates/cpp-library/Class1.h
@@ -0,0 +1,10 @@
+#pragma once
+
+namespace $LibName {
+
+class Class1 {
+public:
+    void hello();
+};
+
+}