diff --git a/trunk/siprp/Main.java b/trunk/siprp/Main.java
index a123990a..99c7c25d 100644
--- a/trunk/siprp/Main.java
+++ b/trunk/siprp/Main.java
@@ -286,6 +286,9 @@ System.out.print( "Loading PM: " + new Date() );
 		// Retrieve a PersistenceManager from the PersistenceManagerFactory.
 		PersistenceManager pm = pmf.getPersistenceManager();
 		JDOObject.setPersistentManager( pm );
+		Singleton.setInstance( Singleton.DEFAULT_PERSISTENCE_MANAGER_FACTORY, pmf );
+		Singleton.setInstance( SingletonConstants.PERSISTENCE_MANAGER, pm );
+
 System.out.println( "PM done " + new Date() );
 	}
 }
\ No newline at end of file
diff --git a/trunk/siprp/ficha/ExamePanel.java b/trunk/siprp/ficha/ExamePanel.java
index edb41fc3..74c21011 100644
--- a/trunk/siprp/ficha/ExamePanel.java
+++ b/trunk/siprp/ficha/ExamePanel.java
@@ -47,7 +47,7 @@ public class ExamePanel extends JPanel
 	private ComponentsHashtable components;
 	
 	private Integer trabalhadorID;
-	private MarcacaoTrabalhador marcacao; 
+	private MarcacaoTrabalhadorData marcacao; 
 	
 	/** Creates a new instance of ExamePanel */
 	public ExamePanel()
@@ -285,7 +285,7 @@ public class ExamePanel extends JPanel
 			{
 				return;
 			}
-			marcacao = ( MarcacaoTrabalhador ) MarcacaoTrabalhador.load( MarcacaoTrabalhador.class, marcacaoID );
+			marcacao = ( MarcacaoTrabalhadorData ) MarcacaoTrabalhadorData.load( MarcacaoTrabalhadorData.class, marcacaoID );
 			proximoExamePanel.setDate( (Date) marcacao.get( Marcacao.DATA ) );
 		}
 		catch( Exception ex )
diff --git a/trunk/siprp/ficha/FichaWindow.java b/trunk/siprp/ficha/FichaWindow.java
index fc308281..a33e2728 100644
--- a/trunk/siprp/ficha/FichaWindow.java
+++ b/trunk/siprp/ficha/FichaWindow.java
@@ -227,7 +227,7 @@ public class FichaWindow extends TabbedWindow
 			trabalhadorID = new Integer( ((Number)key.getFieldValue( fields[ 0 ] )).intValue() );
 			try
 			{
-				siprp.data.MarcacaoTrabalhador.saveMarcacaoExameForTrabalhadorID( trabalhadorID, (Date)exame.getProperty( FichaDataProvider.PROXIMO_EXAME ) );
+				siprp.data.Marcacao.saveMarcacaoExameForTrabalhadorID( trabalhadorID, (Date)exame.getProperty( FichaDataProvider.PROXIMO_EXAME ) );
 			}
 			catch( Exception iex )
 			{