diff --git a/docsrc/tutorials/getting_started.rst b/docsrc/tutorials/getting_started.rst
index a0fc940..9cb7911 100644
--- a/docsrc/tutorials/getting_started.rst
+++ b/docsrc/tutorials/getting_started.rst
@@ -77,7 +77,7 @@ into the file:
 .. code-block:: d
 
    import std.stdio;
-   import yaml;
+   import dyaml.all;
 
    void main()
    {
@@ -100,8 +100,8 @@ into the file:
 Explanation of the code
 ^^^^^^^^^^^^^^^^^^^^^^^
 
-First, we import the *yaml* module. This is the only D:YAML module you need to
-import - it automatically imports all needed modules.
+First, we import the *dyaml.all* module. This is the only D:YAML module you
+need to import - it automatically imports all needed modules.
 
 Next we load the file using the *Loader.load()* method. *Loader* is a struct 
 used for parsing YAML documents. The *load()* method loads the file as
diff --git a/examples/constructor/main.d b/examples/constructor/main.d
index 5b00cd7..0ec2303 100644
--- a/examples/constructor/main.d
+++ b/examples/constructor/main.d
@@ -1,7 +1,7 @@
 import std.ascii;
 import std.stdio;
 import std.string;
-import yaml;
+import dyaml.all;
 
 struct Color
 {
diff --git a/examples/getting_started/main.d b/examples/getting_started/main.d
index 31508b6..26172d3 100644
--- a/examples/getting_started/main.d
+++ b/examples/getting_started/main.d
@@ -1,5 +1,5 @@
 import std.stdio;
-import yaml;
+import dyaml.all;
 
 void main()
 {
diff --git a/examples/representer/main.d b/examples/representer/main.d
index e4b96c4..e17bc9d 100644
--- a/examples/representer/main.d
+++ b/examples/representer/main.d
@@ -1,5 +1,5 @@
 import std.stdio;
-import yaml;
+import dyaml.all;
 
 struct Color
 {
diff --git a/examples/resolver/main.d b/examples/resolver/main.d
index 537ffa8..b8f1006 100644
--- a/examples/resolver/main.d
+++ b/examples/resolver/main.d
@@ -1,7 +1,7 @@
 import std.ascii;
 import std.stdio;
 import std.string;
-import yaml;
+import dyaml.all;
 
 struct Color
 {
diff --git a/examples/yaml_bench/yaml_bench.d b/examples/yaml_bench/yaml_bench.d
index 6689ea6..6c391a4 100644
--- a/examples/yaml_bench/yaml_bench.d
+++ b/examples/yaml_bench/yaml_bench.d
@@ -5,7 +5,7 @@ import std.conv;
 import std.datetime;
 import std.stdio;
 import std.string;
-import yaml;
+import dyaml.all;
 
 ///Print help information.
 void help()
diff --git a/examples/yaml_gen/yaml_gen.d b/examples/yaml_gen/yaml_gen.d
index 0bb082c..8229ad4 100644
--- a/examples/yaml_gen/yaml_gen.d
+++ b/examples/yaml_gen/yaml_gen.d
@@ -7,7 +7,7 @@ import std.math;
 import std.random;
 import std.stdio;
 import std.string;
-import yaml;
+import dyaml.all;
 
 
 immutable alphabet = " abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_";
diff --git a/examples/yaml_stats/yaml_stats.d b/examples/yaml_stats/yaml_stats.d
index 2107d39..4a2877e 100644
--- a/examples/yaml_stats/yaml_stats.d
+++ b/examples/yaml_stats/yaml_stats.d
@@ -3,7 +3,7 @@
 
 import std.stdio;
 import std.string;
-import yaml;
+import dyaml.all;
 
 
 ///Collects statistics about a YAML document and returns them as string.
diff --git a/source/dyaml/constructor.d b/source/dyaml/constructor.d
index 1072c9c..723318c 100644
--- a/source/dyaml/constructor.d
+++ b/source/dyaml/constructor.d
@@ -156,7 +156,7 @@ final class Constructor
          * --------------------
          * import std.string;
          *
-         * import yaml;
+         * import dyaml.all;
          *
          * struct MyStruct
          * {
@@ -210,7 +210,7 @@ final class Constructor
          * --------------------
          * import std.string;
          *
-         * import yaml;
+         * import dyaml.all;
          *
          * struct MyStruct
          * {
@@ -262,7 +262,7 @@ final class Constructor
          * --------------------
          * import std.string;
          *
-         * import yaml;
+         * import dyaml.all;
          *
          * struct MyStruct
          * {
diff --git a/source/dyaml/representer.d b/source/dyaml/representer.d
index 17512d7..f90f7f4 100644
--- a/source/dyaml/representer.d
+++ b/source/dyaml/representer.d
@@ -130,7 +130,7 @@ final class Representer
          * --------------------
          * import std.string;
          *
-         * import yaml;
+         * import dyaml.all;
          *
          * struct MyStruct
          * {
@@ -171,7 +171,7 @@ final class Representer
          * --------------------
          * import std.string;
          *
-         * import yaml;
+         * import dyaml.all;
          *
          * class MyClass
          * {
diff --git a/source/dyaml/resolver.d b/source/dyaml/resolver.d
index b741cdd..98273d3 100644
--- a/source/dyaml/resolver.d
+++ b/source/dyaml/resolver.d
@@ -99,7 +99,7 @@ final class Resolver
          * --------------------
          * import std.regex;
          *
-         * import yaml;
+         * import dyaml.all;
          *
          * void main()
          * {
diff --git a/test/src/common.d b/test/src/common.d
index 6ba4c4f..5611636 100644
--- a/test/src/common.d
+++ b/test/src/common.d
@@ -9,7 +9,7 @@ module dyaml.testcommon;
 public import std.conv;
 public import std.stdio;
 public import std.stream;
-public import yaml;
+public import dyaml.all;
 
 import core.exception;
 import std.algorithm;
diff --git a/unittest.d b/unittest.d
index c3b75a1..c59fca2 100644
--- a/unittest.d
+++ b/unittest.d
@@ -4,7 +4,7 @@
 //    (See accompanying file LICENSE_1_0.txt or copy at
 //          http://www.boost.org/LICENSE_1_0.txt)
 
-import yaml;
+import dyaml.all;
 
 import std.stdio;