diff --git a/trunk/siprp/Main.java b/trunk/siprp/Main.java
index bb6af711..67c0f9be 100644
--- a/trunk/siprp/Main.java
+++ b/trunk/siprp/Main.java
@@ -29,7 +29,7 @@ public class Main implements Connector
 {
 	private final static ClassLoader classLoader = new EVUtilsImageLib().getClass().getClassLoader();
 	
-	private static final String dbase = "siprp";
+	private static String dbase = "siprp";
 	private SIPRPTracker siprpTracker;
 	
 	private static AvisosPanel avisos = null;
@@ -40,6 +40,9 @@ public class Main implements Connector
 		Singleton.setInstance( SingletonConstants.COMPANY_NAME, "Centro Clínico Avenida" );
 		Singleton.setInstance( SingletonConstants.COMPANY_LOGO, "logo_evo.jpg" );
 		Singleton.setInstance( SingletonConstants.WEB_AWARE, Boolean.FALSE );
+		Singleton.setInstance( SingletonConstants.DB_NAME, "shst2" );
+		
+		dbase = (String)Singleton.getInstance( SingletonConstants.DB_NAME );
 /*		Calendar cal = Calendar.getInstance();
 		cal.set( 2004, 06, 14 );
 		if( cal.before( Calendar.getInstance() ) )
@@ -78,7 +81,7 @@ public class Main implements Connector
 				new String[] { "SHSTSoft" }, 
 				new String[] { "Vers\u00E3o 2.0", "(EVOLUTE 2004)" }, "",
 				"root", "UNIXLuvsU", avisos, false );
-		loginWindow.setTitle( "SIPRPSoft" );
+		loginWindow.setTitle( "SHSTSoft" );
 		JPanel left = loginWindow.getLeftPanel();
 		left.setBackground( Color.white );
 		loginWindow.show();
@@ -105,65 +108,6 @@ public class Main implements Connector
 			StatementExecuterFactory.initialize( 
 					new DBStatementExecuter( dbm.getSharedExecuter() ) );
 			initializeJPOX( url, user, passwd );
-////			Properties props = new Properties();
-////			props.load( classLoader.getResourceAsStream( "speedo.properties" ) );
-////			props.setProperty( "javax.jdo.option.ConnectionURL", url );
-////			PersistenceManagerFactory pmf = JDOHelper.getPersistenceManagerFactory( props );
-////			Singleton.setInstance( Singleton.DEFAULT_PERSISTENCE_MANAGER_FACTORY, pmf );
-////			PersistenceManager pm = pmf.getPersistenceManager();
-////			Singleton.setInstance( SingletonConstants.PERSISTENCE_MANAGER, pm );
-////			com.evolute.utils.jdo.JDOObject.setPersistentManager( pm );
-
-//for( int i = 0; i < 5; ++i )
-//{
-//	try
-//	{
-//	System.out.println( "S: " + i );
-//	System.out.println( "ID: " + new siprp.data.EmpresaID() );
-//	}
-//	catch( Throwable t )
-//	{
-//		t.printStackTrace();
-//	}
-//			pm.currentTransaction().begin();
-//			siprp.data.Empresa emp = new siprp.data.Empresa();
-//			emp.set( siprp.data.Empresa.DESIGNACAO_SOCIAL, "J1111212222" );
-//			emp.set( siprp.data.Empresa.MORADA, "J111" );
-//			emp.set( siprp.data.Empresa.CODIGO_POSTAL, "J111" );
-//			emp.set( siprp.data.Empresa.LOCALIDADE, "J111" );
-//			emp.set( siprp.data.Empresa.DISTRITO, "J111" );
-//			emp.set( siprp.data.Empresa.CONCELHO, "J111" );
-//			emp.set( siprp.data.Empresa.DATA_PROPOSTA, new Date() );
-//			emp.set( siprp.data.Empresa.DATA_ACEITACAO, new Date() );
-//			emp.set( siprp.data.Empresa.PERFIL_1, "J111" );
-//			emp.set( siprp.data.Empresa.PERFIL_2, "J111" );
-//			emp.set( siprp.data.Empresa.DATA_ENVIO_CONTRATO, new Date() );
-//			emp.set( siprp.data.Empresa.DATA_RECEPCAO_CONTRATO, new Date() );
-//			emp.set( siprp.data.Empresa.DATA_ENVIO_IDICT, new Date() );
-//			emp.set( siprp.data.Empresa.CODIGO_1, "J111" );
-//			emp.set( siprp.data.Empresa.CODIGO_2, "J111" );
-//			emp.set( siprp.data.Empresa.CODIGO_3, "J111" );
-//			emp.set( siprp.data.Empresa.CAE, "J111" );
-//			emp.set( siprp.data.Empresa.CONTRIBUINTE, "J111" );
-//			emp.set( siprp.data.Empresa.SEGURANCA_SOCIAL, "J111" );
-//			emp.set( siprp.data.Empresa.CONTACTO_1, null );
-//			emp.set( siprp.data.Empresa.CONTACTO_2, null );
-//			emp.set( siprp.data.Empresa.SERVICOS, new Integer( -1 ) );
-//			//emp.set( siprp.data.Empresa.INACTIVO, null );			
-//			pm.makePersistent( emp );
-//			pm.currentTransaction().commit();
-//}
-
-/*			pm.currentTransaction().begin();
-			siprp.data.Empresa emp = new siprp.data.Empresa( new Integer( 999 ), "JDO_teste"  );
-			emp.set( siprp.data.Empresa.ID, new Integer( 999 ) );
-			emp.set( siprp.data.Empresa.DESIGNACAO_SOCIAL, "JDO_TESTE" );
-			pm.makePersistent( emp );
-			pm.currentTransaction().commit();
-*/
-//			siprp.data.Empresa emp = ( siprp.data.Empresa )com.evolute.utils.jdo.JDOObject.load( siprp.data.Empresa.class, "999" );
-//System.out.println( "Nome: " + emp.get( siprp.data.Empresa.DESIGNACAO_SOCIAL ) );
-
 			
 			StatementExecuterFactory.initialize( 
 					new DBStatementExecuter( dbm.getSharedExecuter() ) );
@@ -282,7 +226,7 @@ System.out.println( "INIT: " + d );
 //		jpoxProps.setProperty( "org.jpox.identifier.defaultSchemaName", "informix" );
 		jpoxProps.setProperty( "org.jpox.rdbms.CheckExistTablesOrViews", "false" );
 		
-		System.setProperty( "org.jpox.catalogName", "siprp" );
+		System.setProperty( "org.jpox.catalogName", (String)Singleton.getInstance( SingletonConstants.DB_NAME ) );
 		System.setProperty( "org.jpox.schemaName", "" );
 		
 		PersistenceManagerFactory pmf = JDOHelper.getPersistenceManagerFactory( jpoxProps );
diff --git a/trunk/siprp/SingletonConstants.java b/trunk/siprp/SingletonConstants.java
index fc3ff3c8..ed0081cd 100644
--- a/trunk/siprp/SingletonConstants.java
+++ b/trunk/siprp/SingletonConstants.java
@@ -16,6 +16,7 @@ public class SingletonConstants
 	public static final String COMPANY_NAME = "company_name";
 	public static final String COMPANY_LOGO = "company_logo";
 	public static final String WEB_AWARE = "web_aware";
+	public static final String DB_NAME = "db_name";
 	
 	/** Creates a new instance of SingletonConstants */
 	private SingletonConstants()