Rename from package to name for namevar and update manifests

lib/puppet/provider/package_keywords/parsed.rb

@@ -11,7 +11,7 @@ Puppet::Type.type(:package_keywords).provide(:parsed,
     text_line :comment, :match => /^#/;
     text_line :blank, :match => /^\s*$/;
  
-    record_line :parsed, :fields => %w{package keywords},
+    record_line :parsed, :fields => %w{name keywords},
         :joiner => ' ',
         :rts    => true do |line|
         hash = {}

lib/puppet/provider/package_use/parsed.rb

@@ -11,7 +11,7 @@ Puppet::Type.type(:package_use).provide(:parsed,
     text_line :comment, :match => /^#/;
     text_line :blank, :match => /^\s*$/;
  
-    record_line :parsed, :fields => %w{package use_flags},
+    record_line :parsed, :fields => %w{name use_flags},
         :joiner => ' ',
         :rts    => true do |line|
         hash = {}

lib/puppet/type/package_keywords.rb

@@ -2,14 +2,14 @@ Puppet::Type.newtype(:package_keywords) do
     @doc = "Set keywords for a package
     
             package_keywords { 'app-admin/puppet':
-                package   => 'app-admin/puppet',
                 keywords  => ['~x86', '-hppa'],
+                target    => 'puppet',
             }"
 
     ensurable
 
-    newproperty(:package) do
-        desc "The package"
+    newparam(:name) do
+        desc "The package name"
 
         isnamevar
     end

lib/puppet/type/package_use.rb

 Puppet::Type.newtype(:package_use) do
     @doc = "Set use flags for a package
     
-            package_use { 'puppet':
-                package   => 'app-admin/puppet',
+            package_use { 'app-admin/puppet':
                 use_flags => ['augeas', '-rrdtool'],
+                target    => 'puppet',
             }"
 
     ensurable
 
-    newparam(:package) do
-        desc "The package"
+    newparam(:name) do
+        desc "The package name"
 
         isnamevar
     end