diff --git a/modules/db_postgres/km_db_postgres.c b/modules/db_postgres/db_postgres.c
similarity index 98%
rename from modules/db_postgres/km_db_postgres.c
rename to modules/db_postgres/db_postgres.c
index 68cf350dacd..2b0c63eb803 100644
--- a/modules/db_postgres/km_db_postgres.c
+++ b/modules/db_postgres/db_postgres.c
@@ -1,6 +1,4 @@
 /*
- * $Id$ 
- *
  * Copyright (C) 2001-2003 FhG Fokus
  * Copyright (C) 2008 1&1 Internet AG
  *
@@ -39,7 +37,7 @@
 #include "../../lib/srdb1/db.h"
 #include "../../lib/srdb1/db_query.h"
 #include "km_dbase.h"
-#include "km_db_postgres.h"
+#include "db_postgres.h"
 
 
 /*MODULE_VERSION*/
diff --git a/modules/db_postgres/km_db_postgres.h b/modules/db_postgres/db_postgres.h
similarity index 99%
rename from modules/db_postgres/km_db_postgres.h
rename to modules/db_postgres/db_postgres.h
index 31c89e3cefc..9d2bfc2c0a3 100644
--- a/modules/db_postgres/km_db_postgres.h
+++ b/modules/db_postgres/db_postgres.h
@@ -1,6 +1,4 @@
 /*
- * $Id$ 
- *
  * Copyright (C) 2001-2003 FhG Fokus
  * Copyright (C) 2008 1&1 Internet AG
  *
diff --git a/modules/db_postgres/km_dbase.c b/modules/db_postgres/km_dbase.c
index 7c9a1bb1364..caaac686436 100644
--- a/modules/db_postgres/km_dbase.c
+++ b/modules/db_postgres/km_dbase.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2003 August.Net Services, LLC
  * Copyright (C) 2006 Norman Brandinger
  * Copyright (C) 2008 1&1 Internet AG
@@ -21,41 +19,6 @@
  * along with this program; if not, write to the Free Software 
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
- * History
- * -------
- * 2003-04-06 initial code written (Greg Fausak/Andy Fullford)
- * 2006-07-28 within pg_get_result(): added check to immediatly return of no 
- *            result set was returned added check to only execute 
- *            convert_result() if PGRES_TUPLES_OK added safety check to avoid 
- *            double pg_free_result() (norm)
- * 2006-08-07 Rewrote pg_get_result().
- *            Additional debugging lines have been placed through out the code.
- *            Added Asynchronous Command Processing (PQsendQuery/PQgetResult) 
- *            instead of PQexec. this was done in preparation of adding FETCH 
- *            support.  Note that PQexec returns a result pointer while 
- *            PQsendQuery does not.  The result set pointer is obtained from 
- *            a call (or multiple calls) to PQgetResult.
- *            Removed transaction processing calls (BEGIN/COMMIT/ROLLBACK) as 
- *            they added uneeded overhead.  Klaus' testing showed in excess of 
- *            1ms gain by removing each command.  In addition, Kamailio only 
- *            issues single queries and is not, at this time transaction aware.
- *            The transaction processing routines have been left in place 
- *            should this support be needed in the future.
- *            Updated logic in pg_query / pg_raw_query to accept a (0) result 
- *            set (_r) parameter.  In this case, control is returned
- *            immediately after submitting the query and no call to 
- *            pg_get_results() is performed. This is a requirement for 
- *            FETCH support. (norm)
- * 2006-10-27 Added fetch support (norm)
- *            Removed dependency on aug_* memory routines (norm)
- *            Added connection pooling support (norm)
- *            Standardized API routines to pg_* names (norm)
- * 2006-11-01 Updated pg_insert(), pg_delete(), pg_update() and 
- *            pg_get_result() to handle failed queries.  Detailed warnings 
- *            along with the text of the failed query is now displayed in the 
- *            log. Callers of these routines can now assume that a non-zero 
- *            rc indicates the query failed and that remedial action may need 
- *            to be taken. (norm)
  */
 
 /*! \file
diff --git a/modules/db_postgres/km_dbase.h b/modules/db_postgres/km_dbase.h
index 1b1887720df..9ab6e7039c9 100644
--- a/modules/db_postgres/km_dbase.h
+++ b/modules/db_postgres/km_dbase.h
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2003 August.Net Services, LLC
  * Copyright (C) 2008 1&1 Internet AG
  *
@@ -20,9 +18,6 @@
  * along with this program; if not, write to the Free Software 
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
- * History
- * -------
- * 2003-04-06 initial code written (Greg Fausak/Andy Fullford)
  */
 
 /*! \file
diff --git a/modules/db_postgres/km_pg_con.h b/modules/db_postgres/km_pg_con.h
index ef62397901b..6ff85b99c03 100644
--- a/modules/db_postgres/km_pg_con.h
+++ b/modules/db_postgres/km_pg_con.h
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2003 August.Net Services, LLC
  * Copyright (C) 2008 1&1 Internet AG
  *
@@ -20,9 +18,6 @@
  * along with this program; if not, write to the Free Software 
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
- * History
- * -------
- * 2003-04-06 initial code written (Greg Fausak/Andy Fullford)
  */
 
 /*! \file
diff --git a/modules/db_postgres/km_pg_type.h b/modules/db_postgres/km_pg_type.h
index c488dea9de6..038d277d443 100644
--- a/modules/db_postgres/km_pg_type.h
+++ b/modules/db_postgres/km_pg_type.h
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * POSTGRES module, portions of this code were templated using
  * the mysql module, thus it's similarity.
  *
@@ -23,10 +21,6 @@
  * along with this program; if not, write to the Free Software 
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
- * History
- * -------
- * 2003-04-06 initial code written (Greg Fausak/Andy Fullford)
- *
  */
 
 /*
diff --git a/modules/db_postgres/km_res.c b/modules/db_postgres/km_res.c
index e9aa23227e1..3bfca68593a 100644
--- a/modules/db_postgres/km_res.c
+++ b/modules/db_postgres/km_res.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2003 August.Net Services, LLC
  * Copyright (C) 2006 Norman Brandinger
  * Copyright (C) 2008 1&1 Internet AG
@@ -21,17 +19,6 @@
  * along with this program; if not, write to the Free Software 
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
- * History
- * -------
- * 2003-04-06 initial code written (Greg Fausak/Andy Fullford)
- *
- * 2006-07-26 added BPCHAROID as a valid type for DB1_STRING conversions
- *            this removes the "unknown type 1042" log messages (norm)
- *
- * 2006-10-27 Added fetch support (norm)
- *            Removed dependency on aug_* memory routines (norm)
- *            Added connection pooling support (norm)
- *            Standardized API routines to pg_* names (norm)
  */
 
 /*! \file
diff --git a/modules/db_postgres/km_res.h b/modules/db_postgres/km_res.h
index 51482dd0816..bf2b56232d1 100644
--- a/modules/db_postgres/km_res.h
+++ b/modules/db_postgres/km_res.h
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2007 1&1 Internet AG
  *
  * This file is part of Kamailio, a free SIP server.
diff --git a/modules/db_postgres/km_val.c b/modules/db_postgres/km_val.c
index e1f84fe1dad..0187fa5c8eb 100644
--- a/modules/db_postgres/km_val.c
+++ b/modules/db_postgres/km_val.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2003 August.Net Services, LLC
  * Copyright (C) 2008 1&1 Internet AG
  *
@@ -13,19 +11,13 @@
  *
  * Kamailio is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License 
  * along with this program; if not, write to the Free Software 
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  *
- * History
- * -------
- * 2003-04-06 initial code written (Greg Fausak/Andy Fullford)
- * 2003-04-14 gmtime changed to localtime because mktime later
- *            expects localtime, changed daylight saving bug
- *            previously found in mysql module (janakj)
  */
 
 /*! \file
diff --git a/modules/db_postgres/km_val.h b/modules/db_postgres/km_val.h
index b58e50a41fd..bc47b748648 100644
--- a/modules/db_postgres/km_val.h
+++ b/modules/db_postgres/km_val.h
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * Copyright (C) 2007 1&1 Internet AG
  *
  * This file is part of Kamailio, a free SIP server.
diff --git a/modules/db_postgres/pg_cmd.c b/modules/db_postgres/pg_cmd.c
index 7267cd35830..c0f736cf48e 100644
--- a/modules/db_postgres/pg_cmd.c
+++ b/modules/db_postgres/pg_cmd.c
@@ -1,24 +1,18 @@
 /* 
- * $Id$ 
- *
- * PostgreSQL Database Driver for SER
+ * PostgreSQL Database Driver for Kamailio
  *
  * Portions Copyright (C) 2001-2003 FhG FOKUS
  * Copyright (C) 2003 August.Net Services, LLC
  * Portions Copyright (C) 2005-2008 iptelorg GmbH
  *
- * This file is part of SER, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
- * SER is free software; you can redistribute it and/or modify it under the
+ * Kamailio is free software; you can redistribute it and/or modify it under the
  * terms of the GNU General Public License as published by the Free Software
  * Foundation; either version 2 of the License, or (at your option) any later
  * version
  *
- * For a license to use the ser software under conditions other than those
- * described here, or to purchase support for this software, please contact
- * iptel.org by e-mail at the following addresses: info@iptel.org
- *
- * SER is distributed in the hope that it will be useful, but WITHOUT ANY
+ * Kamailio is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
  * details.
diff --git a/modules/db_postgres/pg_cmd.h b/modules/db_postgres/pg_cmd.h
index c48c31e749b..2c21f99e366 100644
--- a/modules/db_postgres/pg_cmd.h
+++ b/modules/db_postgres/pg_cmd.h
@@ -3,18 +3,14 @@
  * Copyright (C) 2003 August.Net Services, LLC
  * Portions Copyright (C) 2005-2008 iptelorg GmbH
  *
- * This file is part of SER, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
- * SER is free software; you can redistribute it and/or modify it under the
+ * Kamailio is free software; you can redistribute it and/or modify it under the
  * terms of the GNU General Public License as published by the Free Software
  * Foundation; either version 2 of the License, or (at your option) any later
  * version
  *
- * For a license to use the ser software under conditions other than those
- * described here, or to purchase support for this software, please contact
- * iptel.org by e-mail at the following addresses: info@iptel.org
- *
- * SER is distributed in the hope that it will be useful, but WITHOUT ANY
+ * Kamailio is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
  * details.
diff --git a/modules/db_postgres/pg_con.c b/modules/db_postgres/pg_con.c
index 86c68fa409a..411c42981c4 100644
--- a/modules/db_postgres/pg_con.c
+++ b/modules/db_postgres/pg_con.c
@@ -1,24 +1,18 @@
 /* 
- * $Id$ 
- *
- * PostgreSQL Database Driver for SER
+ * PostgreSQL Database Driver for Kamailio
  *
  * Portions Copyright (C) 2001-2003 FhG FOKUS
  * Copyright (C) 2003 August.Net Services, LLC
  * Portions Copyright (C) 2005-2008 iptelorg GmbH
  *
- * This file is part of SER, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
- * SER is free software; you can redistribute it and/or modify it under the
+ * Kamailio is free software; you can redistribute it and/or modify it under the
  * terms of the GNU General Public License as published by the Free Software
  * Foundation; either version 2 of the License, or (at your option) any later
  * version
  *
- * For a license to use the ser software under conditions other than those
- * described here, or to purchase support for this software, please contact
- * iptel.org by e-mail at the following addresses: info@iptel.org
- *
- * SER is distributed in the hope that it will be useful, but WITHOUT ANY
+ * Kamailio is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
  * details.
diff --git a/modules/db_postgres/pg_con.h b/modules/db_postgres/pg_con.h
index 53c36f23135..130655f3fdf 100644
--- a/modules/db_postgres/pg_con.h
+++ b/modules/db_postgres/pg_con.h
@@ -1,24 +1,18 @@
 /* 
- * $Id$ 
- *
- * PostgreSQL Database Driver for SER
+ * PostgreSQL Database Driver for Kamailio
  *
  * Portions Copyright (C) 2001-2003 FhG FOKUS
  * Copyright (C) 2003 August.Net Services, LLC
  * Portions Copyright (C) 2005-2008 iptelorg GmbH
  *
- * This file is part of SER, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
- * SER is free software; you can redistribute it and/or modify it under the
+ * Kamailio is free software; you can redistribute it and/or modify it under the
  * terms of the GNU General Public License as published by the Free Software
  * Foundation; either version 2 of the License, or (at your option) any later
  * version
  *
- * For a license to use the ser software under conditions other than those
- * described here, or to purchase support for this software, please contact
- * iptel.org by e-mail at the following addresses: info@iptel.org
- *
- * SER is distributed in the hope that it will be useful, but WITHOUT ANY
+ * Kamailio is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
  * details.
@@ -82,7 +76,7 @@ int pg_con(db_con_t* con);
 
 
 /** Establish a new connection to server.  
- * This function is called when a SER module calls db_connect to establish a
+ * This function is called when a Kamailio module calls db_connect to establish a
  * new connection to the database server. After the connection is established
  * the function sends an SQL query to the server to determine the format of
  * timestamp fields and also obtains the list of supported field types.
diff --git a/modules/db_postgres/pg_fld.c b/modules/db_postgres/pg_fld.c
index de62c14f9d9..d31e2e891ec 100644
--- a/modules/db_postgres/pg_fld.c
+++ b/modules/db_postgres/pg_fld.c
@@ -3,18 +3,14 @@
  * Copyright (C) 2003 August.Net Services, LLC
  * Portions Copyright (C) 2005-2008 iptelorg GmbH
  *
- * This file is part of SER, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
- * SER is free software; you can redistribute it and/or modify it under the
+ * Kamailio is free software; you can redistribute it and/or modify it under the
  * terms of the GNU General Public License as published by the Free Software
  * Foundation; either version 2 of the License, or (at your option) any later
  * version
  *
- * For a license to use the ser software under conditions other than those
- * described here, or to purchase support for this software, please contact
- * iptel.org by e-mail at the following addresses: info@iptel.org
- *
- * SER is distributed in the hope that it will be useful, but WITHOUT ANY
+ * Kamailio is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
  * details.
diff --git a/modules/db_postgres/pg_fld.h b/modules/db_postgres/pg_fld.h
index 6cd90213d5e..036bd665142 100644
--- a/modules/db_postgres/pg_fld.h
+++ b/modules/db_postgres/pg_fld.h
@@ -3,18 +3,14 @@
  * Copyright (C) 2003 August.Net Services, LLC
  * Portions Copyright (C) 2005-2008 iptelorg GmbH
  *
- * This file is part of SER, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
- * SER is free software; you can redistribute it and/or modify it under the
+ * Kamailio is free software; you can redistribute it and/or modify it under the
  * terms of the GNU General Public License as published by the Free Software
  * Foundation; either version 2 of the License, or (at your option) any later
  * version
  *
- * For a license to use the ser software under conditions other than those
- * described here, or to purchase support for this software, please contact
- * iptel.org by e-mail at the following addresses: info@iptel.org
- *
- * SER is distributed in the hope that it will be useful, but WITHOUT ANY
+ * Kamailio is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
  * details.
diff --git a/modules/db_postgres/pg_mod.c b/modules/db_postgres/pg_mod.c
index 14f50a312da..6b569f695c0 100644
--- a/modules/db_postgres/pg_mod.c
+++ b/modules/db_postgres/pg_mod.c
@@ -1,24 +1,18 @@
 /* 
- * $Id$ 
- *
- * PostgreSQL Database Driver for SER
+ * PostgreSQL Database Driver for Kamailio
  *
  * Portions Copyright (C) 2001-2003 FhG FOKUS
  * Copyright (C) 2003 August.Net Services, LLC
  * Portions Copyright (C) 2005-2008 iptelorg GmbH
  *
- * This file is part of SER, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
- * SER is free software; you can redistribute it and/or modify it under the
+ * Kamailio is free software; you can redistribute it and/or modify it under the
  * terms of the GNU General Public License as published by the Free Software
  * Foundation; either version 2 of the License, or (at your option) any later
  * version
  *
- * For a license to use the ser software under conditions other than those
- * described here, or to purchase support for this software, please contact
- * iptel.org by e-mail at the following addresses: info@iptel.org
- *
- * SER is distributed in the hope that it will be useful, but WITHOUT ANY
+ * Kamailio is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
  * details.
@@ -42,7 +36,7 @@
 #include "pg_cmd.h"
 #include "pg_res.h"
 #include "pg_fld.h"
-#include "km_db_postgres.h"
+#include "db_postgres.h"
 
 #include "../../sr_module.h"
 
diff --git a/modules/db_postgres/pg_mod.h b/modules/db_postgres/pg_mod.h
index 194c7df4912..4e622b60d1b 100644
--- a/modules/db_postgres/pg_mod.h
+++ b/modules/db_postgres/pg_mod.h
@@ -1,24 +1,18 @@
 /* 
- * $Id$ 
- *
- * PostgreSQL Database Driver for SER
+ * PostgreSQL Database Driver for Kamailio
  *
  * Portions Copyright (C) 2001-2003 FhG FOKUS
  * Copyright (C) 2003 August.Net Services, LLC
  * Portions Copyright (C) 2005-2008 iptelorg GmbH
  *
- * This file is part of SER, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
- * SER is free software; you can redistribute it and/or modify it under the
+ * Kamailio is free software; you can redistribute it and/or modify it under the
  * terms of the GNU General Public License as published by the Free Software
  * Foundation; either version 2 of the License, or (at your option) any later
  * version
  *
- * For a license to use the ser software under conditions other than those
- * described here, or to purchase support for this software, please contact
- * iptel.org by e-mail at the following addresses: info@iptel.org
- *
- * SER is distributed in the hope that it will be useful, but WITHOUT ANY
+ * Kamailio is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
  * details.
diff --git a/modules/db_postgres/pg_oid.c b/modules/db_postgres/pg_oid.c
index 52f3e2a9829..d157f24dc03 100644
--- a/modules/db_postgres/pg_oid.c
+++ b/modules/db_postgres/pg_oid.c
@@ -1,24 +1,18 @@
 /* 
- * $Id$ 
- *
- * PostgreSQL Database Driver for SER
+ * PostgreSQL Database Driver for Kamailio
  *
  * Portions Copyright (C) 2001-2003 FhG FOKUS
  * Copyright (C) 2003 August.Net Services, LLC
  * Portions Copyright (C) 2005-2008 iptelorg GmbH
  *
- * This file is part of SER, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
- * SER is free software; you can redistribute it and/or modify it under the
+ * Kamailio is free software; you can redistribute it and/or modify it under the
  * terms of the GNU General Public License as published by the Free Software
  * Foundation; either version 2 of the License, or (at your option) any later
  * version
  *
- * For a license to use the ser software under conditions other than those
- * described here, or to purchase support for this software, please contact
- * iptel.org by e-mail at the following addresses: info@iptel.org
- *
- * SER is distributed in the hope that it will be useful, but WITHOUT ANY
+ * Kamailio is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
  * details.
diff --git a/modules/db_postgres/pg_oid.h b/modules/db_postgres/pg_oid.h
index b8a50d97855..484ad6d1cc9 100644
--- a/modules/db_postgres/pg_oid.h
+++ b/modules/db_postgres/pg_oid.h
@@ -1,24 +1,18 @@
 /* 
- * $Id$ 
- *
- * PostgreSQL Database Driver for SER
+ * PostgreSQL Database Driver for Kamailio
  *
  * Portions Copyright (C) 2001-2003 FhG FOKUS
  * Copyright (C) 2003 August.Net Services, LLC
  * Portions Copyright (C) 2005-2008 iptelorg GmbH
  *
- * This file is part of SER, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
- * SER is free software; you can redistribute it and/or modify it under the
+ * Kamailio is free software; you can redistribute it and/or modify it under the
  * terms of the GNU General Public License as published by the Free Software
  * Foundation; either version 2 of the License, or (at your option) any later
  * version
  *
- * For a license to use the ser software under conditions other than those
- * described here, or to purchase support for this software, please contact
- * iptel.org by e-mail at the following addresses: info@iptel.org
- *
- * SER is distributed in the hope that it will be useful, but WITHOUT ANY
+ * Kamailio is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
  * details.
diff --git a/modules/db_postgres/pg_res.c b/modules/db_postgres/pg_res.c
index 11dcb78b088..f7823ff751b 100644
--- a/modules/db_postgres/pg_res.c
+++ b/modules/db_postgres/pg_res.c
@@ -1,24 +1,18 @@
 /* 
- * $Id$ 
- *
- * PostgreSQL Database Driver for SER
+ * PostgreSQL Database Driver for Kamailio
  *
  * Portions Copyright (C) 2001-2003 FhG FOKUS
  * Copyright (C) 2003 August.Net Services, LLC
  * Portions Copyright (C) 2005-2008 iptelorg GmbH
  *
- * This file is part of SER, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
- * SER is free software; you can redistribute it and/or modify it under the
+ * Kamailio is free software; you can redistribute it and/or modify it under the
  * terms of the GNU General Public License as published by the Free Software
  * Foundation; either version 2 of the License, or (at your option) any later
  * version
  *
- * For a license to use the ser software under conditions other than those
- * described here, or to purchase support for this software, please contact
- * iptel.org by e-mail at the following addresses: info@iptel.org
- *
- * SER is distributed in the hope that it will be useful, but WITHOUT ANY
+ * Kamailio is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
  * details.
diff --git a/modules/db_postgres/pg_res.h b/modules/db_postgres/pg_res.h
index 37ae98a1cc1..b6bd613e0e2 100644
--- a/modules/db_postgres/pg_res.h
+++ b/modules/db_postgres/pg_res.h
@@ -1,24 +1,18 @@
 /* 
- * $Id$ 
- *
- * PostgreSQL Database Driver for SER
+ * PostgreSQL Database Driver for Kamailio
  *
  * Portions Copyright (C) 2001-2003 FhG FOKUS
  * Copyright (C) 2003 August.Net Services, LLC
  * Portions Copyright (C) 2005-2008 iptelorg GmbH
  *
- * This file is part of SER, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
- * SER is free software; you can redistribute it and/or modify it under the
+ * Kamailio is free software; you can redistribute it and/or modify it under the
  * terms of the GNU General Public License as published by the Free Software
  * Foundation; either version 2 of the License, or (at your option) any later
  * version
  *
- * For a license to use the ser software under conditions other than those
- * described here, or to purchase support for this software, please contact
- * iptel.org by e-mail at the following addresses: info@iptel.org
- *
- * SER is distributed in the hope that it will be useful, but WITHOUT ANY
+ * Kamailio is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
  * details.
diff --git a/modules/db_postgres/pg_sql.c b/modules/db_postgres/pg_sql.c
index ab572ddea79..6f64cdeea58 100644
--- a/modules/db_postgres/pg_sql.c
+++ b/modules/db_postgres/pg_sql.c
@@ -1,24 +1,18 @@
 /* 
- * $Id$ 
- *
- * PostgreSQL Database Driver for SER
+ * PostgreSQL Database Driver for Kamailio
  *
  * Portions Copyright (C) 2001-2003 FhG FOKUS
  * Copyright (C) 2003 August.Net Services, LLC
  * Portions Copyright (C) 2005-2008 iptelorg GmbH
  *
- * This file is part of SER, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
- * SER is free software; you can redistribute it and/or modify it under the
+ * Kamailio is free software; you can redistribute it and/or modify it under the
  * terms of the GNU General Public License as published by the Free Software
  * Foundation; either version 2 of the License, or (at your option) any later
  * version
  *
- * For a license to use the ser software under conditions other than those
- * described here, or to purchase support for this software, please contact
- * iptel.org by e-mail at the following addresses: info@iptel.org
- *
- * SER is distributed in the hope that it will be useful, but WITHOUT ANY
+ * Kamailio is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
  * details.
diff --git a/modules/db_postgres/pg_sql.h b/modules/db_postgres/pg_sql.h
index 84288dcfa2d..6a64eb5d1ed 100644
--- a/modules/db_postgres/pg_sql.h
+++ b/modules/db_postgres/pg_sql.h
@@ -1,24 +1,18 @@
 /* 
- * $Id$ 
- *
- * PostgreSQL Database Driver for SER
+ * PostgreSQL Database Driver for Kamailio
  *
  * Portions Copyright (C) 2001-2003 FhG FOKUS
  * Copyright (C) 2003 August.Net Services, LLC
  * Portions Copyright (C) 2005-2008 iptelorg GmbH
  *
- * This file is part of SER, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
- * SER is free software; you can redistribute it and/or modify it under the
+ * Kamailio is free software; you can redistribute it and/or modify it under the
  * terms of the GNU General Public License as published by the Free Software
  * Foundation; either version 2 of the License, or (at your option) any later
  * version
  *
- * For a license to use the ser software under conditions other than those
- * described here, or to purchase support for this software, please contact
- * iptel.org by e-mail at the following addresses: info@iptel.org
- *
- * SER is distributed in the hope that it will be useful, but WITHOUT ANY
+ * Kamailio is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
  * details.
diff --git a/modules/db_postgres/pg_uri.c b/modules/db_postgres/pg_uri.c
index 0980d700f52..977b653e566 100644
--- a/modules/db_postgres/pg_uri.c
+++ b/modules/db_postgres/pg_uri.c
@@ -1,24 +1,18 @@
 /* 
- * $Id$ 
- *
- * PostgreSQL Database Driver for SER
+ * PostgreSQL Database Driver for Kamailio
  *
  * Portions Copyright (C) 2001-2003 FhG FOKUS
  * Copyright (C) 2003 August.Net Services, LLC
  * Portions Copyright (C) 2005-2008 iptelorg GmbH
  *
- * This file is part of SER, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
- * SER is free software; you can redistribute it and/or modify it under the
+ * Kamailio is free software; you can redistribute it and/or modify it under the
  * terms of the GNU General Public License as published by the Free Software
  * Foundation; either version 2 of the License, or (at your option) any later
  * version
  *
- * For a license to use the ser software under conditions other than those
- * described here, or to purchase support for this software, please contact
- * iptel.org by e-mail at the following addresses: info@iptel.org
- *
- * SER is distributed in the hope that it will be useful, but WITHOUT ANY
+ * Kamailio is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
  * details.
diff --git a/modules/db_postgres/pg_uri.h b/modules/db_postgres/pg_uri.h
index 2a7ed452df6..2743b3ed5db 100644
--- a/modules/db_postgres/pg_uri.h
+++ b/modules/db_postgres/pg_uri.h
@@ -1,24 +1,18 @@
 /* 
- * $Id$ 
- *
- * PostgreSQL Database Driver for SER
+ * PostgreSQL Database Driver for Kamailio
  *
  * Portions Copyright (C) 2001-2003 FhG FOKUS
  * Copyright (C) 2003 August.Net Services, LLC
  * Portions Copyright (C) 2005-2008 iptelorg GmbH
  *
- * This file is part of SER, a free SIP server.
+ * This file is part of Kamailio, a free SIP server.
  *
- * SER is free software; you can redistribute it and/or modify it under the
+ * Kamailio is free software; you can redistribute it and/or modify it under the
  * terms of the GNU General Public License as published by the Free Software
  * Foundation; either version 2 of the License, or (at your option) any later
  * version
  *
- * For a license to use the ser software under conditions other than those
- * described here, or to purchase support for this software, please contact
- * iptel.org by e-mail at the following addresses: info@iptel.org
- *
- * SER is distributed in the hope that it will be useful, but WITHOUT ANY
+ * Kamailio is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
  * details.