diff --git a/bin/rip-info b/bin/rip-info
index 431f143..10ad6c8 100755
--- a/bin/rip-info
+++ b/bin/rip-info
@@ -31,7 +31,7 @@ end
 exit 1 if installed.nil?
 
 installed = installed.chomp
-source, version = rip(:metadata, installed).split(' ')
+source, version = rip(:'package-metadata', installed).split(' ')
 
 puts "source: #{source}"
 puts "version: #{version}"
diff --git a/bin/rip-package-handle-sub b/bin/rip-package-handle-sub
index dd73bcb..66baefc 100755
--- a/bin/rip-package-handle-sub
+++ b/bin/rip-package-handle-sub
@@ -23,7 +23,7 @@ synchronize(package_path) do
   if !File.exist?(package_path)
     rip :'cp-package', base_package, package_path, path
 
-    base_metadata = rip "metadata", base_package
+    base_metadata = rip "package-metadata", base_package
     base_source, base_version = base_metadata.split(' ')
 
     write "#{package_path}/metadata.rip" do
diff --git a/bin/rip-metadata b/bin/rip-package-metadata
similarity index 79%
rename from bin/rip-metadata
rename to bin/rip-package-metadata
index 4be69f2..5fd09ef 100755
--- a/bin/rip-metadata
+++ b/bin/rip-package-metadata
@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# Usage: rip-metadata PATH
+# Usage: rip-package-metadata PATH
 #
 # Reads package metadata
 
diff --git a/bin/rip-repackage b/bin/rip-repackage
index 9574b26..a9ce626 100755
--- a/bin/rip-repackage
+++ b/bin/rip-repackage
@@ -8,7 +8,7 @@ $-e = true
 require 'rip/script'
 
 package_path = ARGV[0]
-metadata = rip(:metadata, package_path)
+metadata = rip(:'package-metadata', package_path)
 
 mv package_path, "#{package_path}.original"
 
diff --git a/lib/rip/helpers.rb b/lib/rip/helpers.rb
index 8b81a42..a052f12 100644
--- a/lib/rip/helpers.rb
+++ b/lib/rip/helpers.rb
@@ -13,7 +13,7 @@ def debug(msg)
     end
 
     def metadata(package)
-      if data = rip("metadata #{package}")
+      if data = rip("package-metadata #{package}")
         Package.parse(data)
       end
     end
diff --git a/man/rip-metadata.1.ronn b/man/rip-metadata.1.ronn
deleted file mode 100644
index 2a918ac..0000000
--- a/man/rip-metadata.1.ronn
+++ /dev/null
@@ -1,15 +0,0 @@
-rip-metadata(1) -- package metadata
-===================================
-
-## SYNOPSIS
-
-`rip-metadata` PACKAGE_PATH
-
-## DESCRIPTION
-
-`rip-metadata` prints out packages `metadata.rip` file.
-
-## SEE ALSO
-
-rip(1), rip-package(1),
-<http://hellorip.com/>
diff --git a/man/rip-package-metadata.1.ronn b/man/rip-package-metadata.1.ronn
new file mode 100644
index 0000000..839ecc8
--- /dev/null
+++ b/man/rip-package-metadata.1.ronn
@@ -0,0 +1,15 @@
+rip-package-metadata(1) -- package metadata
+===========================================
+
+## SYNOPSIS
+
+`rip-package-metadata` PACKAGE_PATH
+
+## DESCRIPTION
+
+`rip-package-metadata` prints out packages `metadata.rip` file.
+
+## SEE ALSO
+
+rip(1), rip-package(1),
+<http://hellorip.com/>
diff --git a/man/rip.1.ronn b/man/rip.1.ronn
index 257d602..b37ac27 100644
--- a/man/rip.1.ronn
+++ b/man/rip.1.ronn
@@ -73,8 +73,6 @@ Low level commands for fetching and building packages.
 
   rip-gc(1)
 
-  rip-metadata(1)
-
   rip-package(1)
 
   rip-package-build(1)
@@ -87,6 +85,8 @@ Low level commands for fetching and building packages.
 
   rip-package-handle-sub(1)
 
+  rip-package-metadata(1)
+
   rip-parse(1)
 
   rip-recursive-link(1)
diff --git a/test/metadata_test.rb b/test/metadata_test.rb
deleted file mode 100644
index 713a9e6..0000000
--- a/test/metadata_test.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-require 'helper'
-
-class MetaData < Rip::Test
-  test "metadata" do
-    package = rip "package-handle-gem repl 0.1.0"
-    assert_equal "repl 0.1.0\n", rip("metadata #{package}")
-  end
-end
diff --git a/test/package_git_test.rb b/test/package_git_test.rb
index 1319087..94f0863 100644
--- a/test/package_git_test.rb
+++ b/test/package_git_test.rb
@@ -63,7 +63,7 @@ class PackageGitTest < Rip::Test
 
     assert File.exist?("#{target}/metadata.rip")
     assert_equal "git://localhost/rack 0.9.1", File.read("#{target}/metadata.rip").chomp
-    assert_equal "git://localhost/rack 0.9.1", rip("metadata #{out}").chomp
+    assert_equal "git://localhost/rack 0.9.1", rip("package-metadata #{out}").chomp
 
     rip "install git://localhost/rack 0.9.1"
     assert_equal <<list, rip("list")
diff --git a/test/package_metadata_test.rb b/test/package_metadata_test.rb
new file mode 100644
index 0000000..6a8a155
--- /dev/null
+++ b/test/package_metadata_test.rb
@@ -0,0 +1,8 @@
+require 'helper'
+
+class PackageMetadataTest < Rip::Test
+  test "metadata" do
+    package = rip "package-handle-gem repl 0.1.0"
+    assert_equal "repl 0.1.0\n", rip("package-metadata #{package}")
+  end
+end