diff --git a/doc/pisi.lyx b/doc/pisi.lyx
index 72e314b6..ce454960 100644
--- a/doc/pisi.lyx
+++ b/doc/pisi.lyx
@@ -347,6 +347,12 @@ Dosya bi
 Pisi
 \layout Subparagraph
 
+Meta 
+\series medium 
+(Bence bunu yeniden yapip icine Packager ve History'i koyabiliriz ...
+ -- Eray)
+\layout Subparagraph
+
 Source
 \layout Itemize
 
@@ -687,12 +693,12 @@ Metadata
 
 
 \series bold 
-PSPEC dosyasının Global/Meta bölümü
+PSPEC dosyasının Meta bölümü
 \layout Itemize
 
 
 \series bold 
-PSPEC dosyasının Global/History bölümü
+PSPEC dosyasının Source bölümü
 \layout Itemize
 
 
@@ -749,6 +755,9 @@ XML
 pisi-metadata.dtd
 \emph default 
  dosyasında tanımlanmıştır.
+ (Ek tag'ler de bir section'a eklenmeli ya da yeni section olusturulmali
+ gibi geldi bana, ornegin Distribution olabilir.
+ -- Eray)
 \layout Subsection
 
 files.xml
diff --git a/pisi/metadata.py b/pisi/metadata.py
index f69c2a00..6c5271fb 100644
--- a/pisi/metadata.py
+++ b/pisi/metadata.py
@@ -9,7 +9,7 @@ class MetaData(XmlFile):
     """Package metadata. Metadata is composed of Specfile and various
     other information."""
     def __init__(self):
-        XmlFile.__init__(self, "METADATA")
+        XmlFile.__init__(self, "PISI")
         self.eltList = []
 
     def read(self, filename):
diff --git a/pisi/specfile.py b/pisi/specfile.py
index e3069a04..3ff678d0 100644
--- a/pisi/specfile.py
+++ b/pisi/specfile.py
@@ -95,7 +95,7 @@ class SpecFile(XmlFile):
     """A class for reading/writing from/to a PSPEC (PISI SPEC) file."""
 
     def __init__(self):
-        XmlFile.__init__(self,"PSPEC")
+        XmlFile.__init__(self,"PISI")
 
     def read(self, filename):
         """Read PSPEC file"""
diff --git a/samples/popt/popt.pspec b/samples/popt/popt.pspec
index 03f29f07..3590d009 100644
--- a/samples/popt/popt.pspec
+++ b/samples/popt/popt.pspec
@@ -3,7 +3,7 @@
 <!DOCTYPE PSPEC SYSTEM
 	  "http://www.uludag.org.tr/projeler/pisi/pisi-spec.dtd">
 
-<PSPEC>
+<PISI>
 
   <Source>
     <Name>popt</Name>
@@ -67,4 +67,4 @@
       <Path fileType="header">/usr/include/popt.h</Path>
     </Files>
   </Package>
-</PSPEC>
+</PISI>
diff --git a/tests/sandbox/metadata.xml b/tests/sandbox/metadata.xml
index bb66d4f3..9d93622e 100644
--- a/tests/sandbox/metadata.xml
+++ b/tests/sandbox/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<METADATA><Name>popt</Name><Summary>Command line option parsing library</Summary><Description>Command line option parsing library.
+<PISI><Name>popt</Name><Summary>Command line option parsing library</Summary><Description>Command line option parsing library.
       While it is similiar to getopt(3), it contains a number of enhancements, including:
 
 	1) popt is fully reentrant
@@ -8,4 +8,4 @@
 	3) popt allows users to alias command line arguments
 	4) popt provides convience functions for parsing strings
 	   into argv[] style arrays
-    </Description><Category>devel:library</Category><InstallDependencies/><RuntimeDependencies><Depencency>gettext</Depencency></RuntimeDependencies><License>As-Is</License><Distribution>Pardus</Distribution><DistributionRelease>0.1</DistributionRelease><Architecture>Any</Architecture><InstalledSize>546542</InstalledSize><History><Update><Date>06/14/2005</Date><Version>1.7</Version><Release>3</Release></Update><Update><Date>06/10/2005</Date><Version>1.7</Version><Release>2</Release></Update><Update><Date>05/05/2005</Date><Version>1.7</Version><Release>1</Release></Update></History></METADATA>
\ No newline at end of file
+    </Description><Category>devel:library</Category><InstallDependencies/><RuntimeDependencies><Depencency>gettext</Depencency></RuntimeDependencies><License>As-Is</License><Distribution>Pardus</Distribution><DistributionRelease>0.1</DistributionRelease><Architecture>Any</Architecture><InstalledSize>546542</InstalledSize><History><Update><Date>06/14/2005</Date><Version>1.7</Version><Release>3</Release></Update><Update><Date>06/10/2005</Date><Version>1.7</Version><Release>2</Release></Update><Update><Date>05/05/2005</Date><Version>1.7</Version><Release>1</Release></Update></History></PISI>
\ No newline at end of file
diff --git a/tests/sandbox/sandbox.pspec b/tests/sandbox/sandbox.pspec
index a0eb04e5..5a7678de 100644
--- a/tests/sandbox/sandbox.pspec
+++ b/tests/sandbox/sandbox.pspec
@@ -3,7 +3,7 @@
 <!DOCTYPE PSPEC SYSTEM
 	  "http://www.uludag.org.tr/projeler/pisi/pisi-spec.dtd">
 
-<PSPEC>
+<PISI>
 
   <Source>
     <Name>sandbox</Name>
@@ -30,4 +30,4 @@
     <Summary lang="tr">Bla</Summary>
     <Category>temprorary:zip</Category>
   </Package>
-</PSPEC>
+</PISI>