diff --git a/CHANGELOG.md b/CHANGELOG.md
index f7a8d142..3c785a1f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 This project uses [Semantic Versioning 2.0.0](http://semver.org/).
 
+#### master
+
+- CHANGED: Renamed WhoisDomainKg to WhoisKg (GH-48)
+
 
 #### Release 1.1.0
 
diff --git a/lib/whois/parsers/whois.domain.kg.rb b/lib/whois/parsers/whois.kg.rb
similarity index 76%
rename from lib/whois/parsers/whois.domain.kg.rb
rename to lib/whois/parsers/whois.kg.rb
index 4acd5758..d1722d0c 100644
--- a/lib/whois/parsers/whois.domain.kg.rb
+++ b/lib/whois/parsers/whois.kg.rb
@@ -13,18 +13,15 @@
 module Whois
   class Parsers
 
+    # Parser for the whois.kg server.
     #
-    # = whois.domain.kg
+    # @note This parser is just a stub and provides only a few basic methods
+    #   to check for domain availability and get domain status.
+    #   Please consider to contribute implementing missing methods.
     #
-    # Parser for the whois.domain.kg server.
-    #
-    # NOTE: This parser is just a stub and provides only a few basic methods
-    # to check for domain availability and get domain status.
-    # Please consider to contribute implementing missing methods.
-    # See WhoisNicIt parser for an explanation of all available methods
-    # and examples.
-    #
-    class WhoisDomainKg < Base
+    # @see Whois::Parsers::Example
+    #   The Example parser for the list of all available methods.
+    class WhoisKg < Base
 
       property_supported :status do
         if available?
diff --git a/spec/fixtures/responses/whois.domain.kg/kg/status_available.expected b/spec/fixtures/responses/whois.kg/kg/status_available.expected
similarity index 100%
rename from spec/fixtures/responses/whois.domain.kg/kg/status_available.expected
rename to spec/fixtures/responses/whois.kg/kg/status_available.expected
diff --git a/spec/fixtures/responses/whois.domain.kg/kg/status_available.txt b/spec/fixtures/responses/whois.kg/kg/status_available.txt
similarity index 100%
rename from spec/fixtures/responses/whois.domain.kg/kg/status_available.txt
rename to spec/fixtures/responses/whois.kg/kg/status_available.txt
diff --git a/spec/fixtures/responses/whois.domain.kg/kg/status_registered.expected b/spec/fixtures/responses/whois.kg/kg/status_registered.expected
similarity index 100%
rename from spec/fixtures/responses/whois.domain.kg/kg/status_registered.expected
rename to spec/fixtures/responses/whois.kg/kg/status_registered.expected
diff --git a/spec/fixtures/responses/whois.domain.kg/kg/status_registered.txt b/spec/fixtures/responses/whois.kg/kg/status_registered.txt
similarity index 100%
rename from spec/fixtures/responses/whois.domain.kg/kg/status_registered.txt
rename to spec/fixtures/responses/whois.kg/kg/status_registered.txt
diff --git a/spec/tlds.yml b/spec/tlds.yml
index 1c6629b1..e8e62ad9 100644
--- a/spec/tlds.yml
+++ b/spec/tlds.yml
@@ -703,7 +703,7 @@ ke:
     status_available: u34jedzcq.ke
     status_registered: google.co.ke
 kg:
-    _server: whois.domain.kg
+    _server: whois.kg
     status_available: u34jedzcq.kg
     status_registered: google.kg
 kh:
diff --git a/spec/whois/parsers/responses/whois.domain.kg/kg/status_available_spec.rb b/spec/whois/parsers/responses/whois.kg/kg/status_available_spec.rb
similarity index 80%
rename from spec/whois/parsers/responses/whois.domain.kg/kg/status_available_spec.rb
rename to spec/whois/parsers/responses/whois.kg/kg/status_available_spec.rb
index 11d5c485..2bdfb10d 100644
--- a/spec/whois/parsers/responses/whois.domain.kg/kg/status_available_spec.rb
+++ b/spec/whois/parsers/responses/whois.kg/kg/status_available_spec.rb
@@ -3,7 +3,7 @@
 # This file is autogenerated. Do not edit it manually.
 # If you want change the content of this file, edit
 #
-#   /spec/fixtures/responses/whois.domain.kg/kg/status_available.expected
+#   /spec/fixtures/responses/whois.kg/kg/status_available.expected
 #
 # and regenerate the tests with the following rake task
 #
@@ -11,12 +11,12 @@
 #
 
 require 'spec_helper'
-require 'whois/parsers/whois.domain.kg.rb'
+require 'whois/parsers/whois.kg.rb'
 
-describe Whois::Parsers::WhoisDomainKg, "status_available.expected" do
+describe Whois::Parsers::WhoisKg, "status_available.expected" do
 
   subject do
-    file = fixture("responses", "whois.domain.kg/kg/status_available.txt")
+    file = fixture("responses", "whois.kg/kg/status_available.txt")
     part = Whois::Record::Part.new(body: File.read(file))
     described_class.new(part)
   end
diff --git a/spec/whois/parsers/responses/whois.domain.kg/kg/status_registered_spec.rb b/spec/whois/parsers/responses/whois.kg/kg/status_registered_spec.rb
similarity index 88%
rename from spec/whois/parsers/responses/whois.domain.kg/kg/status_registered_spec.rb
rename to spec/whois/parsers/responses/whois.kg/kg/status_registered_spec.rb
index 54be4ffe..72093eea 100644
--- a/spec/whois/parsers/responses/whois.domain.kg/kg/status_registered_spec.rb
+++ b/spec/whois/parsers/responses/whois.kg/kg/status_registered_spec.rb
@@ -3,7 +3,7 @@
 # This file is autogenerated. Do not edit it manually.
 # If you want change the content of this file, edit
 #
-#   /spec/fixtures/responses/whois.domain.kg/kg/status_registered.expected
+#   /spec/fixtures/responses/whois.kg/kg/status_registered.expected
 #
 # and regenerate the tests with the following rake task
 #
@@ -11,12 +11,12 @@
 #
 
 require 'spec_helper'
-require 'whois/parsers/whois.domain.kg.rb'
+require 'whois/parsers/whois.kg.rb'
 
-describe Whois::Parsers::WhoisDomainKg, "status_registered.expected" do
+describe Whois::Parsers::WhoisKg, "status_registered.expected" do
 
   subject do
-    file = fixture("responses", "whois.domain.kg/kg/status_registered.txt")
+    file = fixture("responses", "whois.kg/kg/status_registered.txt")
     part = Whois::Record::Part.new(body: File.read(file))
     described_class.new(part)
   end