diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULE.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULE.c.xml
index 6a1c8e7c4..69720ed5a 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULE.c.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULE.c.xml
@@ -3,7 +3,10 @@
 <!--
   $Id$
   $Log$
-  Revision 1.2  2006-02-02 17:56:31  pnenzi
+  Revision 1.3  2006-02-21 08:05:18  dwarning
+  Introduction of alias names for modules to prevent cryptic naming.
+
+  Revision 1.2  2006/02/02 17:56:31  pnenzi
 
   Changed adms required version to 2.1.3 ,J
 
@@ -38,7 +41,7 @@
 
 
 <admst:template match="code">
-<admst:value-of select="name"/>
+<admst:value-of select="attribute[name='ngspicename']/value"/>
 <admst:variable name="module" select="%s"/>
 
 #include &quot;ngspice.h&quot;
@@ -114,7 +117,7 @@ int $(module)mSize = sizeof($(module)model);
 </admst:template>
 
 <admst:for-each select="/module">
-  <admst:value-of select="name"/>
+  <admst:value-of select="attribute[name='ngspicename']/value"/>
   <admst:open file="%s.c">
     <admst:value-of select="/simulator/package_string"/>
     <admst:text format="/***\n*** Interface: %s\n"/>
@@ -123,7 +126,7 @@ int $(module)mSize = sizeof($(module)model);
     <admst:text format=" *** created by: %s - %s ***/\n"/>
     <admst:apply-templates select="." match="code"/>
   </admst:open>
-  <admst:value-of select="name"/>
+  <admst:value-of select="attribute[name='ngspicename']/value"/>
   <admst:message format="%s.c: file created\n"/>
 </admst:for-each>
 
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEacld.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEacld.c.xml
index bf217e583..9ec387b46 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEacld.c.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEacld.c.xml
@@ -3,7 +3,10 @@
 <!--
   $Id$
   $Log$
-  Revision 1.2  2006-02-02 17:56:31  pnenzi
+  Revision 1.3  2006-02-21 08:05:18  dwarning
+  Introduction of alias names for modules to prevent cryptic naming.
+
+  Revision 1.2  2006/02/02 17:56:31  pnenzi
 
   Changed adms required version to 2.1.3 ,J
 
@@ -51,7 +54,7 @@
 </admst:template>
 
 <admst:template match="code">
-<admst:value-of select="name"/>
+<admst:value-of select="attribute[name='ngspicename']/value"/>
 <admst:variable name="module" select="%s"/>
 
 #include &quot;ngspice.h&quot;
@@ -74,14 +77,26 @@ int $(module)acLoad(GENmodel *inModel, CKTcircuit *ckt)
   <admst:value-of select="row/name"/>
   <admst:value-of select="column/name"/>
   <admst:value-of select="row/name"/>
-  <admst:text format="  *(here->PTR_J_%s_%s)+=here->JSVAL_%s_%s;\n"/>
+  <admst:value-of select="column/name"/>
+  <admst:value-of select="row/name"/>
+  <admst:value-of select="column/name"/>
+  <admst:value-of select="row/name"/>
+  <admst:value-of select="column/name"/>
+  <admst:value-of select="row/name"/>
+  <admst:text format="  if(here->PTR_J_%s_%s_required) {printf(&quot;JSVAL_%s_%s=%%e\\n&quot;,here->JSVAL_%s_%s); *(here->PTR_J_%s_%s)+=here->JSVAL_%s_%s;}\n"/>
 </admst:for-each>
 <admst:for-each select="jacobian[dynamic='yes']">
   <admst:value-of select="column/name"/>
   <admst:value-of select="row/name"/>
   <admst:value-of select="column/name"/>
   <admst:value-of select="row/name"/>
-  <admst:text format="  *(here->PTR_J_%s_%s+1)+=ckt->CKTomega*here->JDVAL_%s_%s;\n"/>
+  <admst:value-of select="column/name"/>
+  <admst:value-of select="row/name"/>
+  <admst:value-of select="column/name"/>
+  <admst:value-of select="row/name"/>
+  <admst:value-of select="column/name"/>
+  <admst:value-of select="row/name"/>
+  <admst:text format="  if(here->PTR_J_%s_%s_required) {printf(&quot;JDVAL_%s_%s=%%e\\n&quot;,ckt->CKTomega*here->JDVAL_%s_%s); *(here->PTR_J_%s_%s+1)+=ckt->CKTomega*here->JDVAL_%s_%s;}\n"/>
 </admst:for-each>
     } /* End of MOSFET Instance */
   } /* End of Model Instance */
@@ -91,7 +106,7 @@ int $(module)acLoad(GENmodel *inModel, CKTcircuit *ckt)
 </admst:template>
 
 <admst:for-each select="/module">
-  <admst:value-of select="name"/>
+  <admst:value-of select="attribute[name='ngspicename']/value"/>
   <admst:open file="%sacld.c">
     <admst:value-of select="/simulator/package_string"/>
     <admst:text format="/***\n*** Interface: %s\n"/>
@@ -100,7 +115,7 @@ int $(module)acLoad(GENmodel *inModel, CKTcircuit *ckt)
     <admst:text format=" *** created by: %s - %s ***/\n"/>
     <admst:apply-templates select="." match="code"/>
   </admst:open>
-  <admst:value-of select="name"/>
+  <admst:value-of select="attribute[name='ngspicename']/value"/>
   <admst:message format="%sacld.c: file created\n"/>
 </admst:for-each>
 
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEask.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEask.c.xml
index 220579276..9c0b90977 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEask.c.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEask.c.xml
@@ -3,7 +3,10 @@
 <!--
   $Id$
   $Log$
-  Revision 1.2  2006-02-02 17:56:31  pnenzi
+  Revision 1.3  2006-02-21 08:05:18  dwarning
+  Introduction of alias names for modules to prevent cryptic naming.
+
+  Revision 1.2  2006/02/02 17:56:31  pnenzi
 
   Changed adms required version to 2.1.3 ,J
 
@@ -38,7 +41,7 @@
 
 
 <admst:template match="code">
-<admst:value-of select="name"/>
+<admst:value-of select="attribute[name='ngspicename']/value"/>
 <admst:variable name="module" select="%s"/>
 
 #include &quot;ngspice.h&quot;
@@ -79,7 +82,7 @@ int $(module)ask(CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value,
 </admst:template>
 
 <admst:for-each select="/module">
-  <admst:value-of select="name"/>
+  <admst:value-of select="attribute[name='ngspicename']/value"/>
   <admst:open file="%sask.c">
     <admst:value-of select="/simulator/package_string"/>
     <admst:text format="/***\n*** Interface: %s\n"/>
@@ -88,7 +91,7 @@ int $(module)ask(CKTcircuit *ckt, GENinstance *inst, int which, IFvalue *value,
     <admst:text format=" *** created by: %s - %s ***/\n"/>
     <admst:apply-templates select="." match="code"/>
   </admst:open>
-  <admst:value-of select="name"/>
+  <admst:value-of select="attribute[name='ngspicename']/value"/>
   <admst:message format="%sask.c: file created\n"/>
 </admst:for-each>
 
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEdefs.h.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEdefs.h.xml
index 3b27061fb..7f9969a9e 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEdefs.h.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEdefs.h.xml
@@ -3,7 +3,10 @@
 <!--
   $Id$
   $Log$
-  Revision 1.3  2006-02-09 11:25:24  pnenzi
+  Revision 1.4  2006-02-21 08:05:18  dwarning
+  Introduction of alias names for modules to prevent cryptic naming.
+
+  Revision 1.3  2006/02/09 11:25:24  pnenzi
 
   Latest update from Laurent and Dietmar: (empty instances)
 
@@ -47,8 +50,9 @@
 </admst:template>
 
 <admst:template match="code">
-<admst:value-of select="name"/>
+<admst:value-of select="attribute[name='ngspicename']/value"/>
 <admst:variable name="module" select="%s"/>
+
 #ifndef $(module)
 #define $(module)
 
@@ -282,6 +286,9 @@ typedef struct s$(module)model {         /* model structure */
   <admst:text format="  DUMMY_INSTANCE"/>
   <admst:text format="\n} e_$(module)_instance;\n"/>
 
+<admst:value-of select="attribute[name='ngspicename']/value"/>
+<admst:variable name="module" select="%s"/>
+
 #include &quot;$(module)ext.h&quot;
 
 #endif /*$(module)*/
@@ -289,7 +296,7 @@ typedef struct s$(module)model {         /* model structure */
 </admst:template>
 
 <admst:for-each select="/module">
-  <admst:value-of select="name"/>
+  <admst:value-of select="attribute[name='ngspicename']/value"/>
   <admst:open file="%sdefs.h">
     <admst:value-of select="/simulator/package_string"/>
     <admst:text format="/***\n*** Interface: %s\n"/>
@@ -298,7 +305,7 @@ typedef struct s$(module)model {         /* model structure */
     <admst:text format=" *** created by: %s - %s ***/\n"/>
     <admst:apply-templates select="." match="code"/>
   </admst:open>
-  <admst:value-of select="name"/>
+  <admst:value-of select="attribute[name='ngspicename']/value"/>
   <admst:message format="%sdefs.h: file created\n"/>
 </admst:for-each>
 
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEext.h.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEext.h.xml
index 3308d6c24..8d919cecc 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEext.h.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEext.h.xml
@@ -3,7 +3,10 @@
 <!--
   $Id$
   $Log$
-  Revision 1.2  2006-02-02 17:56:31  pnenzi
+  Revision 1.3  2006-02-21 08:05:18  dwarning
+  Introduction of alias names for modules to prevent cryptic naming.
+
+  Revision 1.2  2006/02/02 17:56:31  pnenzi
 
   Changed adms required version to 2.1.3 ,J
 
@@ -36,11 +39,15 @@
 <!DOCTYPE admst SYSTEM "admst.dtd">
 <admst version="2.1.3" xmlns:admst="http://mot-adms.sourceforge.net/xml-files/admst">
 <admst:template match="code">
-<admst:value-of select="name"/>
+<admst:value-of select="attribute[name='ngspicename']/value"/>
 <admst:variable name="module" select="%s"/>
+
 #ifndef __$(module)EXT_H
 #define __$(module)EXT_H
 
+<admst:value-of select="attribute[name='ngspicename']/value"/>
+<admst:variable name="module" select="%s"/>
+
 #include &quot;$(module)defs.h&quot;
 
 extern int $(module)par(int,IFvalue*,GENinstance*,IFvalue*);
@@ -67,7 +74,7 @@ extern void $(module)destroy(GENmodel**);
 
 
 <admst:for-each select="/module">
-  <admst:value-of select="name"/>
+  <admst:value-of select="attribute[name='ngspicename']/value"/>
   <admst:open file="%sext.h">
     <admst:value-of select="/simulator/package_string"/>
     <admst:text format="/***\n*** Interface: %s\n"/>
@@ -76,7 +83,7 @@ extern void $(module)destroy(GENmodel**);
     <admst:text format=" *** created by: %s - %s ***/\n"/>
     <admst:apply-templates select="." match="code"/>
   </admst:open>
-  <admst:value-of select="name"/>
+  <admst:value-of select="attribute[name='ngspicename']/value"/>
   <admst:message format="%sext.h: file created\n"/>
 </admst:for-each>
 
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEguesstopology.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEguesstopology.c.xml
index ea35a7a50..894cc394a 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEguesstopology.c.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEguesstopology.c.xml
@@ -3,7 +3,10 @@
 <!--
   $Id$
   $Log$
-  Revision 1.2  2006-02-02 17:56:31  pnenzi
+  Revision 1.3  2006-02-21 08:05:18  dwarning
+  Introduction of alias names for modules to prevent cryptic naming.
+
+  Revision 1.2  2006/02/02 17:56:31  pnenzi
 
   Changed adms required version to 2.1.3 ,J
 
@@ -259,7 +262,7 @@
 </admst:template>
 
 <admst:template match="code">
-<admst:value-of select="name"/>
+<admst:value-of select="attribute[name='ngspicename']/value"/>
 <admst:variable name="module" select="%s"/>
 
 #include &quot;ngspice.h&quot;
@@ -300,7 +303,7 @@ int $(module)guesstopology (SMPmatrix *matrix, CKTcircuit *ckt, $(module)model *
 </admst:template>
 
 <admst:for-each select="/module">
-  <admst:value-of select="name"/>
+  <admst:value-of select="attribute[name='ngspicename']/value"/>
   <admst:open file="%sguesstopology.c">
     <admst:value-of select="/simulator/package_string"/>
     <admst:text format="/***\n*** Interface: %s\n"/>
@@ -309,7 +312,7 @@ int $(module)guesstopology (SMPmatrix *matrix, CKTcircuit *ckt, $(module)model *
     <admst:text format=" *** created by: %s - %s ***/\n"/>
     <admst:apply-templates select="." match="code"/>
   </admst:open>
-  <admst:value-of select="name"/>
+  <admst:value-of select="attribute[name='ngspicename']/value"/>
   <admst:message format="%sguesstopology.c: file created\n"/>
 </admst:for-each>
 
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEinit.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEinit.c.xml
index 03a2be7ba..6b7588474 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEinit.c.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEinit.c.xml
@@ -3,7 +3,10 @@
 <!--
   $Id$
   $Log$
-  Revision 1.2  2006-02-02 17:56:31  pnenzi
+  Revision 1.3  2006-02-21 08:05:18  dwarning
+  Introduction of alias names for modules to prevent cryptic naming.
+
+  Revision 1.2  2006/02/02 17:56:31  pnenzi
 
   Changed adms required version to 2.1.3 ,J
 
@@ -36,12 +39,13 @@
 <!DOCTYPE admst SYSTEM "admst.dtd">
 <admst version="2.1.3" xmlns:admst="http://mot-adms.sourceforge.net/xml-files/admst">
 <admst:template match="code">
-<admst:value-of select="name"/>
-<admst:variable name="module" select="%s"/>
 #include "config.h"
 
 #include "devdefs.h"
 
+<admst:value-of select="attribute[name='ngspicename']/value"/>
+<admst:variable name="module" select="%s"/>
+
 #include &quot;$(module)itf.h&quot;
 #include &quot;$(module)ext.h&quot;
 #include &quot;$(module)init.h&quot;
@@ -119,7 +123,7 @@ get_$(module)_info(void)
 
 
 <admst:for-each select="/module">
-  <admst:value-of select="name"/>
+  <admst:value-of select="attribute[name='ngspicename']/value"/>
   <admst:open file="%sinit.c">
     <admst:value-of select="/simulator/package_string"/>
     <admst:text format="/***\n*** Interface: %s\n"/>
@@ -128,7 +132,7 @@ get_$(module)_info(void)
     <admst:text format=" *** created by: %s - %s ***/\n"/>
     <admst:apply-templates select="." match="code"/>
   </admst:open>
-  <admst:value-of select="name"/>
+  <admst:value-of select="attribute[name='ngspicename']/value"/>
   <admst:message format="%sinit.c: file created\n"/>
 </admst:for-each>
 
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEinit.h.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEinit.h.xml
index d1eddbf81..79d281cb3 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEinit.h.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEinit.h.xml
@@ -3,7 +3,10 @@
 <!--
   $Id$
   $Log$
-  Revision 1.2  2006-02-02 17:56:31  pnenzi
+  Revision 1.3  2006-02-21 08:05:18  dwarning
+  Introduction of alias names for modules to prevent cryptic naming.
+
+  Revision 1.2  2006/02/02 17:56:31  pnenzi
 
   Changed adms required version to 2.1.3 ,J
 
@@ -36,8 +39,9 @@
 <!DOCTYPE admst SYSTEM "admst.dtd">
 <admst version="2.1.3" xmlns:admst="http://mot-adms.sourceforge.net/xml-files/admst">
 <admst:template match="code">
-<admst:value-of select="name"/>
+<admst:value-of select="attribute[name='ngspicename']/value"/>
 <admst:variable name="module" select="%s"/>
+
 #ifndef _$(module)INIT_H
 #define _$(module)INIT_H
 
@@ -55,7 +59,7 @@ extern int $(module)mSize;
 
 
 <admst:for-each select="/module">
-  <admst:value-of select="name"/>
+  <admst:value-of select="attribute[name='ngspicename']/value"/>
   <admst:open file="%sinit.h">
     <admst:value-of select="/simulator/package_string"/>
     <admst:text format="/***\n*** Interface: %s\n"/>
@@ -64,7 +68,7 @@ extern int $(module)mSize;
     <admst:text format=" *** created by: %s - %s ***/\n"/>
     <admst:apply-templates select="." match="code"/>
   </admst:open>
-  <admst:value-of select="name"/>
+  <admst:value-of select="attribute[name='ngspicename']/value"/>
   <admst:message format="%sinit.h: file created\n"/>
 </admst:for-each>
 
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEitf.h.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEitf.h.xml
index dd4e204e0..6c5d1719c 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEitf.h.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEitf.h.xml
@@ -3,7 +3,10 @@
 <!--
   $Id$
   $Log$
-  Revision 1.2  2006-02-02 17:56:31  pnenzi
+  Revision 1.3  2006-02-21 08:05:18  dwarning
+  Introduction of alias names for modules to prevent cryptic naming.
+
+  Revision 1.2  2006/02/02 17:56:31  pnenzi
 
   Changed adms required version to 2.1.3 ,J
 
@@ -36,8 +39,9 @@
 <!DOCTYPE admst SYSTEM "admst.dtd">
 <admst version="2.1.3" xmlns:admst="http://mot-adms.sourceforge.net/xml-files/admst">
 <admst:template match="code">
-<admst:value-of select="name"/>
+<admst:value-of select="attribute[name='ngspicename']/value"/>
 <admst:variable name="module" select="%s"/>
+
 #ifndef DEV_$(module)
 #define DEV_$(module)
 
@@ -48,7 +52,7 @@ extern SPICEdev *get_$(module)_info(void);
 
 
 <admst:for-each select="/module">
-  <admst:value-of select="name"/>
+  <admst:value-of select="attribute[name='ngspicename']/value"/>
   <admst:open file="%sitf.h">
     <admst:value-of select="/simulator/package_string"/>
     <admst:text format="/***\n*** Interface: %s\n"/>
@@ -57,7 +61,7 @@ extern SPICEdev *get_$(module)_info(void);
     <admst:text format=" *** created by: %s - %s ***/\n"/>
     <admst:apply-templates select="." match="code"/>
   </admst:open>
-  <admst:value-of select="name"/>
+  <admst:value-of select="attribute[name='ngspicename']/value"/>
   <admst:message format="%sitf.h: file created\n"/>
 </admst:for-each>
 
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEload.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEload.c.xml
index 15857fd69..1c9a7c564 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEload.c.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEload.c.xml
@@ -3,7 +3,10 @@
 <!--
   $Id$
   $Log$
-  Revision 1.2  2006-02-02 17:56:31  pnenzi
+  Revision 1.3  2006-02-21 08:05:18  dwarning
+  Introduction of alias names for modules to prevent cryptic naming.
+
+  Revision 1.2  2006/02/02 17:56:31  pnenzi
 
   Changed adms required version to 2.1.3 ,J
 
@@ -51,11 +54,11 @@
 </admst:template>
 
 <admst:template match="code">
-<admst:value-of select="name"/>
-<admst:variable name="module" select="%s"/>
-
 #define NGSPICE_DEBUG_OK
 
+<admst:value-of select="attribute[name='ngspicename']/value"/>
+<admst:variable name="module" select="%s"/>
+
 #include &quot;ngspice.h&quot;
 #include &quot;cktdefs.h&quot;
 #include &quot;$(module)defs.h&quot;
@@ -234,8 +237,9 @@ int $(module)load(inModel,ckt)
 
 <!-- analog/![initial_model|initial_instance|initial_step|noise] -->
 <admst:template match="debug:strobe">
-<admst:value-of select="name"/>
+<admst:value-of select="attribute[name='ngspicename']/value"/>
 <admst:variable name="module" select="%s"/>
+
   <admst:text format="void $(module)debug (CKTcircuit *ckt, $(module)model *model, $(module)instance *here)\n"/>
   <admst:text format="{\n"/>
   <admst:for-each select="node[grounded='no']">
@@ -329,7 +333,7 @@ int $(module)load(inModel,ckt)
 </admst:template>
 
 <admst:for-each select="/module">
-  <admst:value-of select="name"/>
+  <admst:value-of select="attribute[name='ngspicename']/value"/>
   <admst:open file="%sload.c">
     <admst:value-of select="/simulator/package_string"/>
     <admst:text format="/***\n*** Interface: %s\n"/>
@@ -338,7 +342,7 @@ int $(module)load(inModel,ckt)
     <admst:text format=" *** created by: %s - %s ***/\n"/>
     <admst:apply-templates select="." match="code"/>
   </admst:open>
-  <admst:value-of select="name"/>
+  <admst:value-of select="attribute[name='ngspicename']/value"/>
   <admst:message format="%sload.c: file created\n"/>
 </admst:for-each>
 
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEmask.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEmask.c.xml
index 273432bab..9da3cae61 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEmask.c.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEmask.c.xml
@@ -3,7 +3,10 @@
 <!--
   $Id$
   $Log$
-  Revision 1.2  2006-02-02 17:56:31  pnenzi
+  Revision 1.3  2006-02-21 08:05:18  dwarning
+  Introduction of alias names for modules to prevent cryptic naming.
+
+  Revision 1.2  2006/02/02 17:56:31  pnenzi
 
   Changed adms required version to 2.1.3 ,J
 
@@ -38,7 +41,7 @@
 
 
 <admst:template match="code">
-<admst:value-of select="name"/>
+<admst:value-of select="attribute[name='ngspicename']/value"/>
 <admst:variable name="module" select="%s"/>
 
 #include &quot;ngspice.h&quot;
@@ -80,7 +83,7 @@ int $(module)mAsk(CKTcircuit *ckt, GENmodel *inst, int which, IFvalue *value)
 </admst:template>
 
 <admst:for-each select="/module">
-  <admst:value-of select="name"/>
+  <admst:value-of select="attribute[name='ngspicename']/value"/>
   <admst:open file="%smask.c">
     <admst:value-of select="/simulator/package_string"/>
     <admst:text format="/***\n*** Interface: %s\n"/>
@@ -89,7 +92,7 @@ int $(module)mAsk(CKTcircuit *ckt, GENmodel *inst, int which, IFvalue *value)
     <admst:text format=" *** created by: %s - %s ***/\n"/>
     <admst:apply-templates select="." match="code"/>
   </admst:open>
-  <admst:value-of select="name"/>
+  <admst:value-of select="attribute[name='ngspicename']/value"/>
   <admst:message format="%smask.c: file created\n"/>
 </admst:for-each>
 
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEmpar.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEmpar.c.xml
index 6ea2ba006..051353f6f 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEmpar.c.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEmpar.c.xml
@@ -3,7 +3,10 @@
 <!--
   $Id$
   $Log$
-  Revision 1.2  2006-02-02 17:56:31  pnenzi
+  Revision 1.3  2006-02-21 08:05:18  dwarning
+  Introduction of alias names for modules to prevent cryptic naming.
+
+  Revision 1.2  2006/02/02 17:56:31  pnenzi
 
   Changed adms required version to 2.1.3 ,J
 
@@ -38,7 +41,7 @@
 
 
 <admst:template match="code">
-<admst:value-of select="name"/>
+<admst:value-of select="attribute[name='ngspicename']/value"/>
 <admst:variable name="module" select="%s"/>
 
 #include &quot;ngspice.h&quot;
@@ -81,7 +84,7 @@ int $(module)mParam(int param, IFvalue *value, GENmodel *inMod)
 </admst:template>
 
 <admst:for-each select="/module">
-  <admst:value-of select="name"/>
+  <admst:value-of select="attribute[name='ngspicename']/value"/>
   <admst:open file="%smpar.c">
     <admst:value-of select="/simulator/package_string"/>
     <admst:text format="/***\n*** Interface: %s\n"/>
@@ -90,7 +93,7 @@ int $(module)mParam(int param, IFvalue *value, GENmodel *inMod)
     <admst:text format=" *** created by: %s - %s ***/\n"/>
     <admst:apply-templates select="." match="code"/>
   </admst:open>
-  <admst:value-of select="name"/>
+  <admst:value-of select="attribute[name='ngspicename']/value"/>
   <admst:message format="%smpar.c: file created\n"/>
 </admst:for-each>
 
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEpar.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEpar.c.xml
index 6c5ca4813..3c42f1871 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEpar.c.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEpar.c.xml
@@ -3,7 +3,10 @@
 <!--
   $Id$
   $Log$
-  Revision 1.2  2006-02-02 17:56:31  pnenzi
+  Revision 1.3  2006-02-21 08:05:18  dwarning
+  Introduction of alias names for modules to prevent cryptic naming.
+
+  Revision 1.2  2006/02/02 17:56:31  pnenzi
 
   Changed adms required version to 2.1.3 ,J
 
@@ -37,7 +40,7 @@
 <admst version="2.1.3" xmlns:admst="http://mot-adms.sourceforge.net/xml-files/admst">
 
 <admst:template match="code">
-<admst:value-of select="name"/>
+<admst:value-of select="attribute[name='ngspicename']/value"/>
 <admst:variable name="module" select="%s"/>
 
 #include &quot;ngspice.h&quot;
@@ -79,7 +82,7 @@ int $(module)par(int param, IFvalue *value, GENinstance *inst, IFvalue *select)
 </admst:template>
 
 <admst:for-each select="/module">
-  <admst:value-of select="name"/>
+  <admst:value-of select="attribute[name='ngspicename']/value"/>
   <admst:open file="%spar.c">
     <admst:value-of select="/simulator/package_string"/>
     <admst:text format="/***\n*** Interface: %s\n"/>
@@ -88,7 +91,7 @@ int $(module)par(int param, IFvalue *value, GENinstance *inst, IFvalue *select)
     <admst:text format=" *** created by: %s - %s ***/\n"/>
     <admst:apply-templates select="." match="code"/>
   </admst:open>
-  <admst:value-of select="name"/>
+  <admst:value-of select="attribute[name='ngspicename']/value"/>
   <admst:message format="%spar.c: file created\n"/>
 </admst:for-each>
 
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEsetup.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEsetup.c.xml
index 1b240a3ce..d13eb1da3 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEsetup.c.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEsetup.c.xml
@@ -3,7 +3,10 @@
 <!--
   $Id$
   $Log$
-  Revision 1.2  2006-02-02 17:56:31  pnenzi
+  Revision 1.3  2006-02-21 08:05:18  dwarning
+  Introduction of alias names for modules to prevent cryptic naming.
+
+  Revision 1.2  2006/02/02 17:56:31  pnenzi
 
   Changed adms required version to 2.1.3 ,J
 
@@ -51,7 +54,7 @@
 </admst:template>
 
 <admst:template match="code">
-<admst:value-of select="name"/>
+<admst:value-of select="attribute[name='ngspicename']/value"/>
 <admst:variable name="module" select="%s"/>
 
 #include &quot;ngspice.h&quot;
@@ -162,7 +165,7 @@ int $(module)setup (SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *
 </admst:template>
 
 <admst:for-each select="/module">
-  <admst:value-of select="name"/>
+  <admst:value-of select="attribute[name='ngspicename']/value"/>
   <admst:open file="%ssetup.c">
     <admst:value-of select="/simulator/package_string"/>
     <admst:text format="/***\n*** Interface: %s\n"/>
@@ -171,7 +174,7 @@ int $(module)setup (SMPmatrix *matrix, GENmodel *inModel, CKTcircuit *ckt, int *
     <admst:text format=" *** created by: %s - %s ***/\n"/>
     <admst:apply-templates select="." match="code"/>
   </admst:open>
-  <admst:value-of select="name"/>
+  <admst:value-of select="attribute[name='ngspicename']/value"/>
   <admst:message format="%ssetup.c: file created\n"/>
 </admst:for-each>
 
diff --git a/src/spicelib/devices/adms/admst/ngspiceMODULEtemp.c.xml b/src/spicelib/devices/adms/admst/ngspiceMODULEtemp.c.xml
index ae7630363..fd374a5f1 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMODULEtemp.c.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMODULEtemp.c.xml
@@ -3,7 +3,10 @@
 <!--
   $Id$
   $Log$
-  Revision 1.2  2006-02-02 17:56:31  pnenzi
+  Revision 1.3  2006-02-21 08:05:18  dwarning
+  Introduction of alias names for modules to prevent cryptic naming.
+
+  Revision 1.2  2006/02/02 17:56:31  pnenzi
 
   Changed adms required version to 2.1.3 ,J
 
@@ -51,7 +54,7 @@
 </admst:template>
 
 <admst:template match="code">
-<admst:value-of select="name"/>
+<admst:value-of select="attribute[name='ngspicename']/value"/>
 <admst:variable name="module" select="%s"/>
 
 #include &quot;ngspice.h&quot;
@@ -85,7 +88,7 @@ int $(module)temp(GENmodel *inModel, CKTcircuit *ckt)
 </admst:template>
 
 <admst:for-each select="/module">
-  <admst:value-of select="name"/>
+  <admst:value-of select="attribute[name='ngspicename']/value"/>
   <admst:open file="%stemp.c">
     <admst:value-of select="/simulator/package_string"/>
     <admst:text format="/***\n*** Interface: %s\n"/>
@@ -94,7 +97,7 @@ int $(module)temp(GENmodel *inModel, CKTcircuit *ckt)
     <admst:text format=" *** created by: %s - %s ***/\n"/>
     <admst:apply-templates select="." match="code"/>
   </admst:open>
-  <admst:value-of select="name"/>
+  <admst:value-of select="attribute[name='ngspicename']/value"/>
   <admst:message format="%stemp.c: file created\n"/>
 </admst:for-each>
 
diff --git a/src/spicelib/devices/adms/admst/ngspiceMakefile.am.xml b/src/spicelib/devices/adms/admst/ngspiceMakefile.am.xml
index 0fa8df604..b88331a69 100644
--- a/src/spicelib/devices/adms/admst/ngspiceMakefile.am.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceMakefile.am.xml
@@ -3,7 +3,10 @@
 <!--
   $Id$
   $Log$
-  Revision 1.5  2006-02-20 09:07:14  dwarning
+  Revision 1.6  2006-02-21 08:05:18  dwarning
+  Introduction of alias names for modules to prevent cryptic naming.
+
+  Revision 1.5  2006/02/20 09:07:14  dwarning
   For make adms we don't need make an new Makefile. Is done by autogen.sh.
 
   Revision 1.4  2006/02/16 09:17:40  dwarning
@@ -49,12 +52,12 @@
 
 
 <admst:template match="code">
-<admst:value-of select="name"/>
+<admst:value-of select="attribute[name='ngspicename']/value"/>
 <admst:variable name="module" select="%s"/>
 ## Process this file with automake to produce Makefile.in
 
 ADMSXMLINTERFACE:=../admst
-adms:
+$(module).c:
 	admsXml -Iadmsva admsva/$(module).va \\
 	-e \$(ADMSXMLINTERFACE)/ngspiceVersion.xml \\
 	-e \$(ADMSXMLINTERFACE)/ngspiceMODULEitf.h.xml \\
@@ -93,6 +96,23 @@ lib$(module)_a_SOURCES = 	\\
 	$(module)setup.c	\\
 	$(module)temp.c
 
+BUILT_SOURCES = 	\\
+	$(module).c		\\
+	$(module)acld.c	\\
+	$(module)ask.c	\\
+	$(module)defs.h	\\
+	$(module)ext.h	\\
+	$(module)guesstopology.c	\\
+	$(module)init.c	\\
+	$(module)init.h	\\
+	$(module)itf.h	\\
+	$(module)load.c	\\
+	$(module)mask.c	\\
+	$(module)mpar.c	\\
+	$(module)par.c	\\
+	$(module)setup.c	\\
+	$(module)temp.c
+
 #TODO (not implemented) \\
 	$(module)conv.c	\\
 	$(module)del.c	\\
diff --git a/src/spicelib/devices/adms/admst/ngspiceVersion.xml b/src/spicelib/devices/adms/admst/ngspiceVersion.xml
index 66fc7e101..96450ba4f 100644
--- a/src/spicelib/devices/adms/admst/ngspiceVersion.xml
+++ b/src/spicelib/devices/adms/admst/ngspiceVersion.xml
@@ -5,7 +5,10 @@
 -->
 <!--
   $Log$
-  Revision 1.7  2006-02-10 06:59:56  pnenzi
+  Revision 1.8  2006-02-21 08:05:18  dwarning
+  Introduction of alias names for modules to prevent cryptic naming.
+
+  Revision 1.7  2006/02/10 06:59:56  pnenzi
 
   Added section for r and c elements (Laurent)
 
@@ -1710,6 +1713,39 @@
   <admst:value-to select="/simulator/package_bugreport" value="r29173@users.sourceforge.net"/>
 
   <admst:for-each select="/module">
+    <admst:choose>
+      <admst:when test="[name='hic0_full']">
+        <admst:new datatype="attribute" arguments="ngspicename">
+          <admst:push into="../attribute" select="." onduplicate="abort"/>
+          <admst:value-to select="value" value="hicum0"/>
+        </admst:new>
+      </admst:when>
+      <admst:when test="[name='hic2_full']">
+        <admst:new datatype="attribute" arguments="ngspicename">
+          <admst:push into="../attribute" select="." onduplicate="abort"/>
+          <admst:value-to select="value" value="hicum2"/>
+        </admst:new>
+      </admst:when>
+      <admst:when test="[name='bjt504_va']">
+        <admst:new datatype="attribute" arguments="ngspicename">
+          <admst:push into="../attribute" select="." onduplicate="abort"/>
+          <admst:value-to select="value" value="mextram"/>
+        </admst:new>
+      </admst:when>
+      <admst:when test="[name='pspva']">
+        <admst:new datatype="attribute" arguments="ngspicename">
+          <admst:push into="../attribute" select="." onduplicate="abort"/>
+          <admst:value-to select="value" value="psp"/>
+        </admst:new>
+      </admst:when>
+      <admst:otherwise>
+        <admst:new datatype="attribute" arguments="ngspicename">
+          <admst:push into="../attribute" select="." onduplicate="abort"/>
+          <admst:value-of select="../name"/>
+          <admst:value-to select="value" value="%s"/>
+        </admst:new>
+      </admst:otherwise>
+    </admst:choose>
     <admst:choose>
       <admst:when test="[name='r2_et_cmc' or name='r2_cmc']">
       </admst:when>