diff --git a/org.adempiere.ui.zk/plugin.xml b/org.adempiere.ui.zk/plugin.xml
index 7477968a47..0e5e2a10f3 100644
--- a/org.adempiere.ui.zk/plugin.xml
+++ b/org.adempiere.ui.zk/plugin.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plugin>
 <?eclipse version="3.4"?>
 <plugin>
    <extension-point id="org.adempiere.webui.Form" name="Web Form" schema="schema/org.adempiere.webui.Form.exsd"/>
diff --git a/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/model/MWebService.java b/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/model/MWebService.java
index 62b499f1d8..cfeb9aaa97 100644
--- a/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/model/MWebService.java
+++ b/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/model/MWebService.java
@@ -47,7 +47,7 @@ import org.idempiere.cache.ImmutablePOSupport;
  *	
  *  @author Carlos Ruiz
  */
-@org.adempiere.base.Model(table = X_WS_WebService.Table_Name)
+@org.adempiere.base.Model(table="WS_WebService")
 public class MWebService extends X_WS_WebService implements ImmutablePOSupport
 {
 	/**
diff --git a/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/model/MWebServiceMethod.java b/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/model/MWebServiceMethod.java
index f3e3193a31..84e7e63e17 100644
--- a/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/model/MWebServiceMethod.java
+++ b/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/model/MWebServiceMethod.java
@@ -35,7 +35,7 @@ import org.idempiere.cache.ImmutablePOSupport;
  * @author hengsin
  *
  */
-@org.adempiere.base.Model(table = X_WS_WebServiceMethod.Table_Name)
+@org.adempiere.base.Model(table="WS_WebServiceMethod")
 public class MWebServiceMethod extends X_WS_WebServiceMethod implements ImmutablePOSupport {
 
 	/**
diff --git a/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/model/MWebServicePara.java b/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/model/MWebServicePara.java
index cd533b15d9..c080eef4d3 100644
--- a/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/model/MWebServicePara.java
+++ b/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/model/MWebServicePara.java
@@ -39,7 +39,7 @@ import org.compiere.util.Env;
  *	
  *  @author Carlos Ruiz
  */
-@org.adempiere.base.Model(table = X_WS_WebService_Para.Table_Name)
+@org.adempiere.base.Model(table="WS_WebService_Para")
 public class MWebServicePara extends X_WS_WebService_Para
 {
 	/**
diff --git a/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/model/MWebServiceType.java b/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/model/MWebServiceType.java
index 75457d270d..7551df98e3 100644
--- a/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/model/MWebServiceType.java
+++ b/org.idempiere.webservices/WEB-INF/src/org/idempiere/webservices/model/MWebServiceType.java
@@ -51,7 +51,7 @@ import org.idempiere.cache.ImmutablePOSupport;
  *  @author Carlos Ruiz
  *  @author Deepak Pansheriya - Updated to support CreateUpdate service
  */
-@org.adempiere.base.Model(table = X_WS_WebServiceType.Table_Name)
+@org.adempiere.base.Model(table="WS_WebServiceType")
 public class MWebServiceType extends X_WS_WebServiceType implements ImmutablePOSupport
 {
 	/**