diff --git a/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/actual/ActualTableService.java b/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalhoService.java
similarity index 80%
rename from trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/actual/ActualTableService.java
rename to trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalhoService.java
index 10053121..50dc1e55 100644
--- a/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/actual/ActualTableService.java
+++ b/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalhoService.java
@@ -1,4 +1,4 @@
-package com.evolute.siprp.client.panels.apps.AnaliseAcidentesTrabalho.actual;
+package com.evolute.siprp.client.panels.apps.AnaliseAcidentesTrabalho;
 
 import java.util.Vector;
 
@@ -6,7 +6,9 @@ import com.evolute.siprp.client.vo.ActualTableRow;
 import com.evolute.siprp.client.vo.Utilizador;
 import com.google.gwt.user.client.rpc.RemoteService;
 
-public interface ActualTableService extends RemoteService
+public interface AnaliseAcidentesTrabalhoService extends RemoteService
 {
+
 	public Vector< ActualTableRow > getActualTableData( Utilizador userLogged );
+	
 }
diff --git a/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/actual/ActualTableServiceAsync.java b/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalhoServiceAsync.java
similarity index 84%
rename from trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/actual/ActualTableServiceAsync.java
rename to trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalhoServiceAsync.java
index 9e220d40..671bd5e3 100644
--- a/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/actual/ActualTableServiceAsync.java
+++ b/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalhoServiceAsync.java
@@ -1,4 +1,4 @@
-package com.evolute.siprp.client.panels.apps.AnaliseAcidentesTrabalho.actual;
+package com.evolute.siprp.client.panels.apps.AnaliseAcidentesTrabalho;
 
 import java.util.Vector;
 
@@ -6,7 +6,9 @@ import com.evolute.siprp.client.vo.ActualTableRow;
 import com.evolute.siprp.client.vo.Utilizador;
 import com.google.gwt.user.client.rpc.AsyncCallback;
 
-public interface ActualTableServiceAsync 
+public interface AnaliseAcidentesTrabalhoServiceAsync 
 {
+
 	public void getActualTableData( Utilizador userLogged, AsyncCallback< Vector< ActualTableRow > > callback );
+	
 }
diff --git a/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/actual/ActualTable.java b/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/actual/ActualTable.java
index bb87140b..953a6508 100644
--- a/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/actual/ActualTable.java
+++ b/trunk/GestaoSHST/src/com/evolute/siprp/client/panels/apps/AnaliseAcidentesTrabalho/actual/ActualTable.java
@@ -2,6 +2,8 @@ package com.evolute.siprp.client.panels.apps.AnaliseAcidentesTrabalho.actual;
 
 import java.util.Vector;
 
+import com.evolute.siprp.client.panels.apps.AnaliseAcidentesTrabalho.AnaliseAcidentesTrabalhoService;
+import com.evolute.siprp.client.panels.apps.AnaliseAcidentesTrabalho.AnaliseAcidentesTrabalhoServiceAsync;
 import com.evolute.siprp.client.panels.utils.navigation.PageNavigation;
 import com.evolute.siprp.client.vo.ActualTableRow;
 import com.google.gwt.core.client.GWT;
@@ -15,15 +17,15 @@ public class ActualTable extends FlexTable
 {
 	private final DateTimeFormat D_F = DateTimeFormat.getFormat( "yyyy-MM-dd" );
 	
-	private ActualTableServiceAsync actualService;
+	private AnaliseAcidentesTrabalhoServiceAsync aatService;
 	
 	public ActualTable()
 	{
 		super();
 		
-		this.actualService = ( ActualTableServiceAsync ) GWT.create( ActualTableService.class );
-		ServiceDefTarget serviceDef = ( ServiceDefTarget ) this.actualService;
-		serviceDef.setServiceEntryPoint( GWT.getModuleBaseURL() + "actualService" );
+		this.aatService = ( AnaliseAcidentesTrabalhoServiceAsync ) GWT.create( AnaliseAcidentesTrabalhoService.class );
+		ServiceDefTarget serviceDef = ( ServiceDefTarget ) this.aatService;
+		serviceDef.setServiceEntryPoint( GWT.getModuleBaseURL() + "aatService" );
 		
 		
 		this.setText( 0, 0, "Data do acidente" );
@@ -44,7 +46,7 @@ public class ActualTable extends FlexTable
 		this.setText( 1, 0, "loading ..." );
 		this.getFlexCellFormatter().setColSpan( 1, 0, 6 );
 		
-		this.actualService.getActualTableData( PageNavigation.getProvider().getUserLogged(), new AsyncCallback< Vector< ActualTableRow > >() {
+		this.aatService.getActualTableData( PageNavigation.getProvider().getUserLogged(), new AsyncCallback< Vector< ActualTableRow > >() {
 			@Override
 			public void onFailure( Throwable caught ) 
 			{
diff --git a/trunk/GestaoSHST/src/com/evolute/siprp/server/logic/AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalhoLogic.java b/trunk/GestaoSHST/src/com/evolute/siprp/server/logic/AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalhoLogic.java
index 47858129..de058be7 100644
--- a/trunk/GestaoSHST/src/com/evolute/siprp/server/logic/AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalhoLogic.java
+++ b/trunk/GestaoSHST/src/com/evolute/siprp/server/logic/AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalhoLogic.java
@@ -3,13 +3,13 @@ package com.evolute.siprp.server.logic.AnaliseAcidentesTrabalho;
 import java.util.Date;
 import java.util.Vector;
 
-import com.evolute.siprp.client.panels.apps.AnaliseAcidentesTrabalho.actual.ActualTableService;
+import com.evolute.siprp.client.panels.apps.AnaliseAcidentesTrabalho.AnaliseAcidentesTrabalhoService;
 import com.evolute.siprp.client.vo.ActualTableRow;
 import com.evolute.siprp.client.vo.Utilizador;
 import com.evolute.siprp.server.logic.AnaliseAcidentesTrabalho.actual.ActualTableDataProvider;
 import com.evolute.utils.arrays.Virtual2DArray;
 
-public class AnaliseAcidentesTrabalhoLogic implements ActualTableService
+public class AnaliseAcidentesTrabalhoLogic implements AnaliseAcidentesTrabalhoService
 {
 
 	private ActualTableDataProvider actualProvider = null;
diff --git a/trunk/GestaoSHST/src/com/evolute/siprp/server/logic/AnaliseAcidentesTrabalho/actual/ActualTableServiceImpl.java b/trunk/GestaoSHST/src/com/evolute/siprp/server/logic/AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalhoServiceImpl.java
similarity index 59%
rename from trunk/GestaoSHST/src/com/evolute/siprp/server/logic/AnaliseAcidentesTrabalho/actual/ActualTableServiceImpl.java
rename to trunk/GestaoSHST/src/com/evolute/siprp/server/logic/AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalhoServiceImpl.java
index cfa97fdf..23ebee00 100644
--- a/trunk/GestaoSHST/src/com/evolute/siprp/server/logic/AnaliseAcidentesTrabalho/actual/ActualTableServiceImpl.java
+++ b/trunk/GestaoSHST/src/com/evolute/siprp/server/logic/AnaliseAcidentesTrabalho/AnaliseAcidentesTrabalhoServiceImpl.java
@@ -1,17 +1,16 @@
-package com.evolute.siprp.server.logic.AnaliseAcidentesTrabalho.actual;
+package com.evolute.siprp.server.logic.AnaliseAcidentesTrabalho;
 
 import java.util.Vector;
 
-import com.evolute.siprp.client.panels.apps.AnaliseAcidentesTrabalho.actual.ActualTableService;
+import com.evolute.siprp.client.panels.apps.AnaliseAcidentesTrabalho.AnaliseAcidentesTrabalhoService;
 import com.evolute.siprp.client.vo.ActualTableRow;
 import com.evolute.siprp.client.vo.Utilizador;
-import com.evolute.siprp.server.logic.AnaliseAcidentesTrabalho.AnaliseAcidentesTrabalhoLogic;
 import com.google.gwt.user.server.rpc.RemoteServiceServlet;
 
-public class ActualTableServiceImpl extends RemoteServiceServlet implements ActualTableService 
+public class AnaliseAcidentesTrabalhoServiceImpl extends RemoteServiceServlet implements AnaliseAcidentesTrabalhoService 
 {
-	private static final long serialVersionUID = -2932430810080164417L;
-
+	private static final long serialVersionUID = -8785113866553581244L;
+	
 	private AnaliseAcidentesTrabalhoLogic logic;
 	
 	@Override
@@ -25,5 +24,4 @@ public class ActualTableServiceImpl extends RemoteServiceServlet implements Actu
 		return logic.getActualTableData( userLogged );
 	}
 
-	
 }
diff --git a/trunk/GestaoSHST/war/WEB-INF/web.xml b/trunk/GestaoSHST/war/WEB-INF/web.xml
index 5feb6e1c..318f3b6c 100644
--- a/trunk/GestaoSHST/war/WEB-INF/web.xml
+++ b/trunk/GestaoSHST/war/WEB-INF/web.xml
@@ -25,12 +25,12 @@
 	</servlet-mapping>
   
   	<servlet>
-		<servlet-name>actualServlet</servlet-name>
-		<servlet-class>com.evolute.siprp.server.logic.AnaliseAcidentesTrabalho.actual.ActualTableServiceImpl</servlet-class>
+		<servlet-name>aatServlet</servlet-name>
+		<servlet-class>com.evolute.siprp.server.logic.AnaliseAcidentesTrabalho.AnaliseAcidentesTrabalhoServiceImpl</servlet-class>
 	</servlet>
 	<servlet-mapping>
-		<servlet-name>actualServlet</servlet-name>
-		<url-pattern>/gestaoshst/actualService</url-pattern>
+		<servlet-name>aatServlet</servlet-name>
+		<url-pattern>/gestaoshst/aatService</url-pattern>
 	</servlet-mapping>
 	
   <!-- Default page to serve -->