diff --git a/client/zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/sample/documents/documents.xml b/client/zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/sample/documents/documents.xml
index 023af6fb61..63d4640980 100644
--- a/client/zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/sample/documents/documents.xml
+++ b/client/zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/sample/documents/documents.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<documents xmlns="http://flies.openl10n.net/api/v1/" xmlns:ns2="http://flies.openl10n.net/api/gettext/header">
+<documents xmlns="http://zanata.org/namespace/api/">
     <document path="foo/" name="foo.properties" xml:lang="en-US" id="foo/foo.properties" content-type="text/plain">
         <document-content>
             <text-flow version="1" id="FOOD">
diff --git a/client/zanata-client-ant-properties/src/test/resources/org/zanata/client/ant/properties/test2/documents.xml b/client/zanata-client-ant-properties/src/test/resources/org/zanata/client/ant/properties/test2/documents.xml
index 023af6fb61..63d4640980 100644
--- a/client/zanata-client-ant-properties/src/test/resources/org/zanata/client/ant/properties/test2/documents.xml
+++ b/client/zanata-client-ant-properties/src/test/resources/org/zanata/client/ant/properties/test2/documents.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<documents xmlns="http://flies.openl10n.net/api/v1/" xmlns:ns2="http://flies.openl10n.net/api/gettext/header">
+<documents xmlns="http://zanata.org/namespace/api/">
     <document path="foo/" name="foo.properties" xml:lang="en-US" id="foo/foo.properties" content-type="text/plain">
         <document-content>
             <text-flow version="1" id="FOOD">
diff --git a/client/zanata-client-commands/src/main/java/org/zanata/client/commands/OptionsUtil.java b/client/zanata-client-commands/src/main/java/org/zanata/client/commands/OptionsUtil.java
index 6fb3024f75..b8bed547f5 100644
--- a/client/zanata-client-commands/src/main/java/org/zanata/client/commands/OptionsUtil.java
+++ b/client/zanata-client-commands/src/main/java/org/zanata/client/commands/OptionsUtil.java
@@ -15,7 +15,7 @@
 import org.slf4j.LoggerFactory;
 import org.zanata.client.VersionUtility;
 import org.zanata.client.config.ConfigUtil;
-import org.zanata.client.config.FliesConfig;
+import org.zanata.client.config.ZanataConfig;
 import org.zanata.client.config.LocaleList;
 import org.zanata.client.exceptions.ConfigException;
 import org.zanata.rest.client.ZanataProxyFactory;
@@ -37,7 +37,7 @@ public static void applyConfigFiles(ConfigurableOptions opts) throws Configurati
          ConfigurableProjectOptions projOpts = (ConfigurableProjectOptions) opts;
          if (projOpts.getProjectConfig() != null)
          {
-            JAXBContext jc = JAXBContext.newInstance(FliesConfig.class);
+            JAXBContext jc = JAXBContext.newInstance(ZanataConfig.class);
             Unmarshaller unmarshaller = jc.createUnmarshaller();
             String projectConfigName = projOpts.getProjectConfig();
             File projectConfigFile = new File(projectConfigName);
@@ -54,7 +54,7 @@ public static void applyConfigFiles(ConfigurableOptions opts) throws Configurati
             if (projectConfigFile.exists())
             {
                log.info("Loading project config from {}", projectConfigFile);
-               FliesConfig projectConfig = (FliesConfig) unmarshaller.unmarshal(projectConfigFile);
+               ZanataConfig projectConfig = (ZanataConfig) unmarshaller.unmarshal(projectConfigFile);
                // local project config is supposed to override user's zanata.ini,
                // so we apply it first
                applyProjectConfig(projOpts, projectConfig);
@@ -86,7 +86,7 @@ public static void applyConfigFiles(ConfigurableOptions opts) throws Configurati
     * 
     * @param config
     */
-   private static void applyProjectConfig(ConfigurableProjectOptions opts, FliesConfig config)
+   private static void applyProjectConfig(ConfigurableProjectOptions opts, ZanataConfig config)
    {
       if (opts.getProj() == null)
       {
diff --git a/client/zanata-client-commands/src/main/java/org/zanata/client/config/FliesConfig.java b/client/zanata-client-commands/src/main/java/org/zanata/client/config/ZanataConfig.java
similarity index 97%
rename from client/zanata-client-commands/src/main/java/org/zanata/client/config/FliesConfig.java
rename to client/zanata-client-commands/src/main/java/org/zanata/client/config/ZanataConfig.java
index 8be5ad87df..b633568d0b 100644
--- a/client/zanata-client-commands/src/main/java/org/zanata/client/config/FliesConfig.java
+++ b/client/zanata-client-commands/src/main/java/org/zanata/client/config/ZanataConfig.java
@@ -37,7 +37,7 @@
  */
 @XmlType(name = "configType", propOrder = { "url", "project", "projectVersion", "locales" })
 @XmlRootElement(name = "config")
-public class FliesConfig implements Serializable
+public class ZanataConfig implements Serializable
 {
    private static final long serialVersionUID = 1L;
    private LocaleList locales = new LocaleList();
@@ -45,7 +45,7 @@ public class FliesConfig implements Serializable
    private URL url;
    private String projectVersion;
 
-   public FliesConfig()
+   public ZanataConfig()
    {
    }
 
diff --git a/client/zanata-client-commands/src/main/java/org/zanata/client/config/package-info.java b/client/zanata-client-commands/src/main/java/org/zanata/client/config/package-info.java
index 295fcab1c0..68d62230f6 100644
--- a/client/zanata-client-commands/src/main/java/org/zanata/client/config/package-info.java
+++ b/client/zanata-client-commands/src/main/java/org/zanata/client/config/package-info.java
@@ -23,7 +23,7 @@
  * Package-level annotations
  */
 @XmlAccessorOrder(XmlAccessOrder.ALPHABETICAL)
-@XmlSchema(namespace = Namespaces.FLIES_CONFIG, elementFormDefault = XmlNsForm.QUALIFIED)
+@XmlSchema(namespace = Namespaces.ZANATA_CONFIG, elementFormDefault = XmlNsForm.QUALIFIED)
 package org.zanata.client.config;
 
 import javax.xml.bind.annotation.XmlAccessOrder;
diff --git a/client/zanata-client-commands/src/test/java/org/zanata/client/config/ZanataConfigTest.java b/client/zanata-client-commands/src/test/java/org/zanata/client/config/ZanataConfigTest.java
index f3fd0ea243..96e3fa8f54 100644
--- a/client/zanata-client-commands/src/test/java/org/zanata/client/config/ZanataConfigTest.java
+++ b/client/zanata-client-commands/src/test/java/org/zanata/client/config/ZanataConfigTest.java
@@ -14,13 +14,13 @@
 import org.apache.commons.configuration.FileConfiguration;
 import org.apache.commons.configuration.HierarchicalINIConfiguration;
 import org.apache.commons.configuration.SystemConfiguration;
-import org.zanata.client.config.FliesConfig;
+import org.zanata.client.config.ZanataConfig;
 import org.zanata.client.config.LocaleList;
 import org.zanata.client.config.LocaleMapping;
 
 public class ZanataConfigTest extends TestCase
 {
-   JAXBContext jc = JAXBContext.newInstance(FliesConfig.class);
+   JAXBContext jc = JAXBContext.newInstance(ZanataConfig.class);
    Unmarshaller unmarshaller = jc.createUnmarshaller();
    Marshaller marshaller = jc.createMarshaller();
    File zanataProjectXml = new File(System.getProperty("user.dir"), "target/zanata.xml");
@@ -44,7 +44,7 @@ public void testWriteReadProject() throws Exception
 
    void writeProject() throws Exception
    {
-      FliesConfig config = new FliesConfig();
+      ZanataConfig config = new ZanataConfig();
       config.setUrl(new URL("http://example.com"));
       config.setProject("project");
       config.setProjectVersion("version");
@@ -55,7 +55,7 @@ void writeProject() throws Exception
 
    void readProject() throws Exception
    {
-      FliesConfig config = (FliesConfig) unmarshaller.unmarshal(zanataProjectXml);
+      ZanataConfig config = (ZanataConfig) unmarshaller.unmarshal(zanataProjectXml);
       assertEquals(new URL("http://example.com"), config.getUrl());
       assertEquals("project", config.getProject());
       assertEquals("version", config.getProjectVersion());
diff --git a/client/zanata-client-commands/src/test/resources/test2/zanata.xml b/client/zanata-client-commands/src/test/resources/test2/zanata.xml
index c2a0e11522..aaf6d41531 100644
--- a/client/zanata-client-commands/src/test/resources/test2/zanata.xml
+++ b/client/zanata-client-commands/src/test/resources/test2/zanata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<config xmlns="http://flies.openl10n.net/config/v1/"> 
+<config xmlns="http://zanata.org/namespace/config/">
 	<url>http://localhost:8080/zanata/</url> 
 	<project>sample-project</project> 
 	<project-version>1.1</project-version>
diff --git a/client/zanata-client-commands/src/test/resources/zanata.xml b/client/zanata-client-commands/src/test/resources/zanata.xml
index ffee71c5fb..03beff2d73 100644
--- a/client/zanata-client-commands/src/test/resources/zanata.xml
+++ b/client/zanata-client-commands/src/test/resources/zanata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<config xmlns="http://flies.openl10n.net/config/v1/"> 
+<config xmlns="http://zanata.org/namespace/config/">
 	<url>http://localhost:8080/zanata/</url> 
 	<project>sample-project</project> 
 	<project-version>1.1</project-version>
diff --git a/client/zanata-maven-plugin/demo/zanata.xml b/client/zanata-maven-plugin/demo/zanata.xml
index d0c52bf4d9..ca3f89799d 100644
--- a/client/zanata-maven-plugin/demo/zanata.xml
+++ b/client/zanata-maven-plugin/demo/zanata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<config xmlns="http://flies.openl10n.net/config/v1/"> 
+<config xmlns="http://zanata.org/namespace/config/">
 	<url>http://localhost:8080/zanata/</url> 
 	<project>sample-project</project> 
 	<project-version>1.1</project-version>
diff --git a/client/zanata-maven-plugin/sample-scripts/zanata.xml b/client/zanata-maven-plugin/sample-scripts/zanata.xml
index e2c83813f2..1cab0fe95a 100644
--- a/client/zanata-maven-plugin/sample-scripts/zanata.xml
+++ b/client/zanata-maven-plugin/sample-scripts/zanata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<config xmlns="http://flies.openl10n.net/config/v1/">
+<config xmlns="http://zanata.org/namespace/config/">
       <url>https://translate.jboss.org/</url>
       <project>example-project</project>
       <project-version>1.0</project-version>
diff --git a/common/zanata-common-api/src/main/java/org/zanata/common/Namespaces.java b/common/zanata-common-api/src/main/java/org/zanata/common/Namespaces.java
index 57dac523ae..b04353ecfe 100644
--- a/common/zanata-common-api/src/main/java/org/zanata/common/Namespaces.java
+++ b/common/zanata-common-api/src/main/java/org/zanata/common/Namespaces.java
@@ -3,10 +3,10 @@
 public final class Namespaces
 {
 
-   public static final String FLIES = "http://flies.openl10n.net/api/v1/";
-   public static final String COMMENT = "http://flies.openl10n.net/api/v1/comment/";
-   public static final String GETTEXT = "http://flies.openl10n.net/api/v1/gettext/";
-   public static final String FLIES_CONFIG = "http://flies.openl10n.net/config/v1/";
+   public static final String ZANATA_API = "http://zanata.org/namespace/api/";
+   public static final String COMMENT = ZANATA_API + "comment/";
+   public static final String GETTEXT = ZANATA_API + "gettext/";
+   public static final String ZANATA_CONFIG = "http://zanata.org/namespace/config/";
    public static final String XML = "http://www.w3.org/XML/1998/namespace";
 
    private Namespaces()
diff --git a/common/zanata-common-api/src/main/java/org/zanata/common/package-info.java b/common/zanata-common-api/src/main/java/org/zanata/common/package-info.java
index 65f5f8dc1c..2eaa4b5598 100644
--- a/common/zanata-common-api/src/main/java/org/zanata/common/package-info.java
+++ b/common/zanata-common-api/src/main/java/org/zanata/common/package-info.java
@@ -1,3 +1,3 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = org.zanata.common.Namespaces.FLIES)
+@javax.xml.bind.annotation.XmlSchema(namespace = org.zanata.common.Namespaces.ZANATA_API)
 package org.zanata.common;
 
diff --git a/common/zanata-common-api/src/main/java/org/zanata/rest/GenerateSamples.java b/common/zanata-common-api/src/main/java/org/zanata/rest/GenerateSamples.java
index 2dc72192e8..e6f9a0a8d1 100644
--- a/common/zanata-common-api/src/main/java/org/zanata/rest/GenerateSamples.java
+++ b/common/zanata-common-api/src/main/java/org/zanata/rest/GenerateSamples.java
@@ -148,7 +148,7 @@ private <T extends HasSample<T>> void write(String heading, Class<T> clazz) thro
    // if (namespaceUri == null || namespaceUri.isEmpty() ) {
    // return "";
    // }
-   // if (namespaceUri.equalsIgnoreCase(Namespaces.FLIES)) {
+   // if (namespaceUri.equalsIgnoreCase(Namespaces.ZANATA_API)) {
    // return "";
    // }
    // if (namespaceUri.equalsIgnoreCase(PoHeader.NAMESPACE)) {
diff --git a/common/zanata-common-api/src/main/java/org/zanata/rest/MediaTypes.java b/common/zanata-common-api/src/main/java/org/zanata/rest/MediaTypes.java
index bb0338e5da..e05133a418 100644
--- a/common/zanata-common-api/src/main/java/org/zanata/rest/MediaTypes.java
+++ b/common/zanata-common-api/src/main/java/org/zanata/rest/MediaTypes.java
@@ -25,47 +25,27 @@ public String toString()
    private static final String XML = "+xml";
    private static final String JSON = "+json";
 
-   private static final String APPLICATION_VND_FLIES = "application/vnd.flies";
+   private static final String APPLICATION_VND_ZANATA = "application/vnd.zanata";
 
-   public static final String APPLICATION_FLIES_PROJECT = APPLICATION_VND_FLIES + ".project";
-   public static final String APPLICATION_FLIES_PROJECT_XML = APPLICATION_FLIES_PROJECT + XML;
-   public static final String APPLICATION_FLIES_PROJECT_JSON = APPLICATION_FLIES_PROJECT + JSON;
+   public static final String APPLICATION_ZANATA_PROJECT = APPLICATION_VND_ZANATA + ".project";
+   public static final String APPLICATION_ZANATA_PROJECT_XML = APPLICATION_ZANATA_PROJECT + XML;
+   public static final String APPLICATION_ZANATA_PROJECT_JSON = APPLICATION_ZANATA_PROJECT + JSON;
 
-   public static final String APPLICATION_FLIES_PROJECTS = APPLICATION_VND_FLIES + ".projects";
-   public static final String APPLICATION_FLIES_PROJECTS_XML = APPLICATION_FLIES_PROJECTS + XML;
-   public static final String APPLICATION_FLIES_PROJECTS_JSON = APPLICATION_FLIES_PROJECTS + JSON;
+   public static final String APPLICATION_ZANATA_PROJECTS = APPLICATION_VND_ZANATA + ".projects";
+   public static final String APPLICATION_ZANATA_PROJECTS_XML = APPLICATION_ZANATA_PROJECTS + XML;
+   public static final String APPLICATION_ZANATA_PROJECTS_JSON = APPLICATION_ZANATA_PROJECTS + JSON;
 
-   public static final String APPLICATION_FLIES_PROJECT_ITERATION = APPLICATION_VND_FLIES + ".project.iteration";
-   public static final String APPLICATION_FLIES_PROJECT_ITERATION_XML = APPLICATION_FLIES_PROJECT_ITERATION + XML;
-   public static final String APPLICATION_FLIES_PROJECT_ITERATION_JSON = APPLICATION_FLIES_PROJECT_ITERATION + JSON;
+   public static final String APPLICATION_ZANATA_PROJECT_ITERATION = APPLICATION_VND_ZANATA + ".project.iteration";
+   public static final String APPLICATION_ZANATA_PROJECT_ITERATION_XML = APPLICATION_ZANATA_PROJECT_ITERATION + XML;
+   public static final String APPLICATION_ZANATA_PROJECT_ITERATION_JSON = APPLICATION_ZANATA_PROJECT_ITERATION + JSON;
 
-   public static final String APPLICATION_FLIES_PROJECT_ITERATIONS = APPLICATION_VND_FLIES + ".project.iterations";
-   public static final String APPLICATION_FLIES_PROJECT_ITERATIONS_XML = APPLICATION_FLIES_PROJECT_ITERATIONS + XML;
-   public static final String APPLICATION_FLIES_PROJECT_ITERATIONS_JSON = APPLICATION_FLIES_PROJECT_ITERATIONS + JSON;
+	public static final String APPLICATION_ZANATA_ACCOUNT = APPLICATION_VND_ZANATA + ".account";
+	public static final String APPLICATION_ZANATA_ACCOUNT_XML = APPLICATION_ZANATA_ACCOUNT + XML;
+	public static final String APPLICATION_ZANATA_ACCOUNT_JSON = APPLICATION_ZANATA_ACCOUNT + JSON;
 
-   public static final String APPLICATION_FLIES_DOCUMENT = APPLICATION_VND_FLIES + ".document";
-   public static final String APPLICATION_FLIES_DOCUMENT_XML = APPLICATION_FLIES_DOCUMENT + XML;
-   public static final String APPLICATION_FLIES_DOCUMENT_JSON = APPLICATION_FLIES_DOCUMENT + JSON;
-
-   public static final String APPLICATION_FLIES_DOCUMENTS = APPLICATION_VND_FLIES + ".documents";
-   public static final String APPLICATION_FLIES_DOCUMENTS_XML = APPLICATION_FLIES_DOCUMENTS + XML;
-   public static final String APPLICATION_FLIES_DOCUMENTS_JSON = APPLICATION_FLIES_DOCUMENTS + JSON;
-
-   public static final String APPLICATION_FLIES_DOCUMENT_RESOURCE = APPLICATION_VND_FLIES + ".document.resource";
-   public static final String APPLICATION_FLIES_DOCUMENT_RESOURCE_XML = APPLICATION_FLIES_DOCUMENT_RESOURCE + XML;
-   public static final String APPLICATION_FLIES_DOCUMENT_RESOURCE_JSON = APPLICATION_FLIES_DOCUMENT_RESOURCE + JSON;
-
-   public static final String APPLICATION_FLIES_DOCUMENT_RESOURCES = APPLICATION_VND_FLIES + ".document.resources";
-   public static final String APPLICATION_FLIES_DOCUMENT_RESOURCES_XML = APPLICATION_FLIES_DOCUMENT_RESOURCES + XML;
-   public static final String APPLICATION_FLIES_DOCUMENT_RESOURCES_JSON = APPLICATION_FLIES_DOCUMENT_RESOURCES + JSON;
-
-	public static final String APPLICATION_FLIES_ACCOUNT = APPLICATION_VND_FLIES + ".account";
-	public static final String APPLICATION_FLIES_ACCOUNT_XML = APPLICATION_FLIES_ACCOUNT + XML;
-	public static final String APPLICATION_FLIES_ACCOUNT_JSON = APPLICATION_FLIES_ACCOUNT + JSON;
-
-   public static final String APPLICATION_FLIES_VERSION = APPLICATION_VND_FLIES + ".Version";
-   public static final String APPLICATION_FLIES_VERSION_XML = APPLICATION_FLIES_VERSION + XML;
-   public static final String APPLICATION_FLIES_VERSION_JSON = APPLICATION_FLIES_VERSION + JSON;
+   public static final String APPLICATION_ZANATA_VERSION = APPLICATION_VND_ZANATA + ".Version";
+   public static final String APPLICATION_ZANATA_VERSION_XML = APPLICATION_ZANATA_VERSION + XML;
+   public static final String APPLICATION_ZANATA_VERSION_JSON = APPLICATION_ZANATA_VERSION + JSON;
 
    /**
     * Creates a format specific MediaType string given an existing media type
diff --git a/common/zanata-common-api/src/main/java/org/zanata/rest/client/IAccountResource.java b/common/zanata-common-api/src/main/java/org/zanata/rest/client/IAccountResource.java
index 944823705e..8c1f08339a 100644
--- a/common/zanata-common-api/src/main/java/org/zanata/rest/client/IAccountResource.java
+++ b/common/zanata-common-api/src/main/java/org/zanata/rest/client/IAccountResource.java
@@ -16,12 +16,12 @@ public interface IAccountResource
 
    @GET
    @Produces(
-   {MediaTypes.APPLICATION_FLIES_ACCOUNT_XML, MediaTypes.APPLICATION_FLIES_ACCOUNT_JSON})
+   {MediaTypes.APPLICATION_ZANATA_ACCOUNT_XML, MediaTypes.APPLICATION_ZANATA_ACCOUNT_JSON})
    public ClientResponse<Account> get();
 
    @PUT
    @Consumes(
-   {MediaTypes.APPLICATION_FLIES_ACCOUNT_XML, MediaTypes.APPLICATION_FLIES_ACCOUNT_JSON})
+   {MediaTypes.APPLICATION_ZANATA_ACCOUNT_XML, MediaTypes.APPLICATION_ZANATA_ACCOUNT_JSON})
    public ClientResponse put(Account account);
 
 }
diff --git a/common/zanata-common-api/src/main/java/org/zanata/rest/client/IProjectIterationResource.java b/common/zanata-common-api/src/main/java/org/zanata/rest/client/IProjectIterationResource.java
index 166d9a6ac2..ea1a32b6c4 100644
--- a/common/zanata-common-api/src/main/java/org/zanata/rest/client/IProjectIterationResource.java
+++ b/common/zanata-common-api/src/main/java/org/zanata/rest/client/IProjectIterationResource.java
@@ -15,11 +15,11 @@ public interface IProjectIterationResource
 {
 
    @GET
-   @Produces( { MediaTypes.APPLICATION_FLIES_PROJECT_ITERATION_XML, MediaTypes.APPLICATION_FLIES_PROJECT_ITERATION_JSON })
+   @Produces( { MediaTypes.APPLICATION_ZANATA_PROJECT_ITERATION_XML, MediaTypes.APPLICATION_ZANATA_PROJECT_ITERATION_JSON })
    public ClientResponse<ProjectIteration> get();
 
    @PUT
-   @Consumes( { MediaTypes.APPLICATION_FLIES_PROJECT_ITERATION_XML, MediaTypes.APPLICATION_FLIES_PROJECT_ITERATION_JSON })
+   @Consumes( { MediaTypes.APPLICATION_ZANATA_PROJECT_ITERATION_XML, MediaTypes.APPLICATION_ZANATA_PROJECT_ITERATION_JSON })
    public ClientResponse put(ProjectIteration project);
 
    // @Path("/documents")
diff --git a/common/zanata-common-api/src/main/java/org/zanata/rest/client/IProjectResource.java b/common/zanata-common-api/src/main/java/org/zanata/rest/client/IProjectResource.java
index 6fcfb1f05b..0bbcb78427 100644
--- a/common/zanata-common-api/src/main/java/org/zanata/rest/client/IProjectResource.java
+++ b/common/zanata-common-api/src/main/java/org/zanata/rest/client/IProjectResource.java
@@ -15,11 +15,11 @@ public interface IProjectResource
 {
 
    @GET
-   @Produces( { MediaTypes.APPLICATION_FLIES_PROJECT_XML, MediaTypes.APPLICATION_FLIES_PROJECT_ITERATION_JSON })
+   @Produces( { MediaTypes.APPLICATION_ZANATA_PROJECT_XML, MediaTypes.APPLICATION_ZANATA_PROJECT_ITERATION_JSON })
    public ClientResponse<Project> get();
 
    @PUT
-   @Consumes( { MediaTypes.APPLICATION_FLIES_PROJECT_XML, MediaTypes.APPLICATION_FLIES_PROJECT_ITERATION_JSON })
+   @Consumes( { MediaTypes.APPLICATION_ZANATA_PROJECT_XML, MediaTypes.APPLICATION_ZANATA_PROJECT_ITERATION_JSON })
    public ClientResponse put(Project project);
 
 }
diff --git a/common/zanata-common-api/src/main/java/org/zanata/rest/client/IProjectsResource.java b/common/zanata-common-api/src/main/java/org/zanata/rest/client/IProjectsResource.java
index 73b56a5452..3f3bfc52e1 100644
--- a/common/zanata-common-api/src/main/java/org/zanata/rest/client/IProjectsResource.java
+++ b/common/zanata-common-api/src/main/java/org/zanata/rest/client/IProjectsResource.java
@@ -16,7 +16,7 @@ public interface IProjectsResource
 {
 
    @GET
-   @Produces( { MediaTypes.APPLICATION_FLIES_PROJECTS_XML, MediaTypes.APPLICATION_FLIES_PROJECTS_JSON })
+   @Produces( { MediaTypes.APPLICATION_ZANATA_PROJECTS_XML, MediaTypes.APPLICATION_ZANATA_PROJECTS_JSON })
    public ClientResponse<List<Project>> get();
 
 }
diff --git a/common/zanata-common-api/src/main/java/org/zanata/rest/client/IVersion.java b/common/zanata-common-api/src/main/java/org/zanata/rest/client/IVersion.java
index 114ca36a66..18ffd8d910 100644
--- a/common/zanata-common-api/src/main/java/org/zanata/rest/client/IVersion.java
+++ b/common/zanata-common-api/src/main/java/org/zanata/rest/client/IVersion.java
@@ -32,7 +32,7 @@
 public interface IVersion
 {
    @GET
-   @Produces({ MediaTypes.APPLICATION_FLIES_VERSION_XML })
+   @Produces({ MediaTypes.APPLICATION_ZANATA_VERSION_XML })
    public VersionInfo get();
 
 }
diff --git a/common/zanata-common-api/src/main/java/org/zanata/rest/dto/Account.java b/common/zanata-common-api/src/main/java/org/zanata/rest/dto/Account.java
index 70bfcc531c..a550966f48 100644
--- a/common/zanata-common-api/src/main/java/org/zanata/rest/dto/Account.java
+++ b/common/zanata-common-api/src/main/java/org/zanata/rest/dto/Account.java
@@ -155,7 +155,7 @@ public void setTribes(Set<String> tribes)
    @Override
    public String getMediaType(Format format)
    {
-      return MediaTypes.APPLICATION_FLIES_ACCOUNT + format;
+      return MediaTypes.APPLICATION_ZANATA_ACCOUNT + format;
    }
 
    @Override
diff --git a/common/zanata-common-api/src/main/java/org/zanata/rest/dto/Project.java b/common/zanata-common-api/src/main/java/org/zanata/rest/dto/Project.java
index 794dfacee4..e25bf3e7a2 100644
--- a/common/zanata-common-api/src/main/java/org/zanata/rest/dto/Project.java
+++ b/common/zanata-common-api/src/main/java/org/zanata/rest/dto/Project.java
@@ -176,7 +176,7 @@ public Collection<Project> createSamples()
    @Override
    public String getMediaType(Format format)
    {
-      return MediaTypes.APPLICATION_FLIES_PROJECT + format;
+      return MediaTypes.APPLICATION_ZANATA_PROJECT + format;
    }
 
    @Override
diff --git a/common/zanata-common-api/src/main/java/org/zanata/rest/dto/ProjectIteration.java b/common/zanata-common-api/src/main/java/org/zanata/rest/dto/ProjectIteration.java
index 6b26e3fe4e..a71f1a9ef0 100644
--- a/common/zanata-common-api/src/main/java/org/zanata/rest/dto/ProjectIteration.java
+++ b/common/zanata-common-api/src/main/java/org/zanata/rest/dto/ProjectIteration.java
@@ -117,7 +117,7 @@ public Collection<ProjectIteration> createSamples()
    @Override
    public String getMediaType(Format format)
    {
-      return MediaTypes.APPLICATION_FLIES_PROJECT_ITERATION + format;
+      return MediaTypes.APPLICATION_ZANATA_PROJECT_ITERATION + format;
    }
 
    @Override
diff --git a/common/zanata-common-api/src/main/java/org/zanata/rest/dto/package-info.java b/common/zanata-common-api/src/main/java/org/zanata/rest/dto/package-info.java
index 0e8710fc95..69ceab23e5 100644
--- a/common/zanata-common-api/src/main/java/org/zanata/rest/dto/package-info.java
+++ b/common/zanata-common-api/src/main/java/org/zanata/rest/dto/package-info.java
@@ -1,3 +1,3 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = org.zanata.common.Namespaces.FLIES)
+@javax.xml.bind.annotation.XmlSchema(namespace = org.zanata.common.Namespaces.ZANATA_API)
 package org.zanata.rest.dto;
 
diff --git a/common/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/package-info.java b/common/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/package-info.java
index a3f426c38d..d3593f2f9f 100644
--- a/common/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/package-info.java
+++ b/common/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/package-info.java
@@ -1,3 +1,3 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = org.zanata.common.Namespaces.FLIES)
+@javax.xml.bind.annotation.XmlSchema(namespace = org.zanata.common.Namespaces.ZANATA_API)
 package org.zanata.rest.dto.resource;
 
diff --git a/common/zanata-common-api/src/main/java/org/zanata/rest/service/AccountResource.java b/common/zanata-common-api/src/main/java/org/zanata/rest/service/AccountResource.java
index d0176a732d..8e7640d9f4 100644
--- a/common/zanata-common-api/src/main/java/org/zanata/rest/service/AccountResource.java
+++ b/common/zanata-common-api/src/main/java/org/zanata/rest/service/AccountResource.java
@@ -39,11 +39,11 @@ public interface AccountResource
 {
 
    @GET
-   @Produces({ MediaTypes.APPLICATION_FLIES_ACCOUNT_XML, MediaTypes.APPLICATION_FLIES_ACCOUNT_JSON })
+   @Produces({ MediaTypes.APPLICATION_ZANATA_ACCOUNT_XML, MediaTypes.APPLICATION_ZANATA_ACCOUNT_JSON })
    public Response get();
 
    @PUT
-   @Consumes({ MediaTypes.APPLICATION_FLIES_ACCOUNT_XML, MediaTypes.APPLICATION_FLIES_ACCOUNT_JSON })
+   @Consumes({ MediaTypes.APPLICATION_ZANATA_ACCOUNT_XML, MediaTypes.APPLICATION_ZANATA_ACCOUNT_JSON })
    public Response put(Account account);
 
 }
\ No newline at end of file
diff --git a/common/zanata-common-api/src/main/java/org/zanata/rest/service/ProjectIterationResource.java b/common/zanata-common-api/src/main/java/org/zanata/rest/service/ProjectIterationResource.java
index c5953fc662..9acadbc8e4 100644
--- a/common/zanata-common-api/src/main/java/org/zanata/rest/service/ProjectIterationResource.java
+++ b/common/zanata-common-api/src/main/java/org/zanata/rest/service/ProjectIterationResource.java
@@ -42,15 +42,15 @@ public interface ProjectIterationResource
 {
 
    @HEAD
-   @Produces({ MediaTypes.APPLICATION_FLIES_PROJECT_ITERATION_XML, MediaTypes.APPLICATION_FLIES_PROJECT_ITERATION_JSON, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+   @Produces({ MediaTypes.APPLICATION_ZANATA_PROJECT_ITERATION_XML, MediaTypes.APPLICATION_ZANATA_PROJECT_ITERATION_JSON, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
    public Response head();
 
    @GET
-   @Produces({ MediaTypes.APPLICATION_FLIES_PROJECT_ITERATION_XML, MediaTypes.APPLICATION_FLIES_PROJECT_ITERATION_JSON, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+   @Produces({ MediaTypes.APPLICATION_ZANATA_PROJECT_ITERATION_XML, MediaTypes.APPLICATION_ZANATA_PROJECT_ITERATION_JSON, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
    public Response get();
 
    @PUT
-   @Consumes({ MediaTypes.APPLICATION_FLIES_PROJECT_ITERATION_XML, MediaTypes.APPLICATION_FLIES_PROJECT_ITERATION_JSON, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+   @Consumes({ MediaTypes.APPLICATION_ZANATA_PROJECT_ITERATION_XML, MediaTypes.APPLICATION_ZANATA_PROJECT_ITERATION_JSON, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
    public Response put(InputStream messageBody);
 
 }
\ No newline at end of file
diff --git a/common/zanata-common-api/src/main/java/org/zanata/rest/service/ProjectResource.java b/common/zanata-common-api/src/main/java/org/zanata/rest/service/ProjectResource.java
index 5eef33ac84..0ace4b8944 100644
--- a/common/zanata-common-api/src/main/java/org/zanata/rest/service/ProjectResource.java
+++ b/common/zanata-common-api/src/main/java/org/zanata/rest/service/ProjectResource.java
@@ -42,15 +42,15 @@ public interface ProjectResource
 {
 
    @HEAD
-   @Produces({ MediaTypes.APPLICATION_FLIES_PROJECT_XML, MediaTypes.APPLICATION_FLIES_PROJECT_JSON, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+   @Produces({ MediaTypes.APPLICATION_ZANATA_PROJECT_XML, MediaTypes.APPLICATION_ZANATA_PROJECT_JSON, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
    public Response head();
 
    @GET
-   @Produces({ MediaTypes.APPLICATION_FLIES_PROJECT_XML, MediaTypes.APPLICATION_FLIES_PROJECT_JSON, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+   @Produces({ MediaTypes.APPLICATION_ZANATA_PROJECT_XML, MediaTypes.APPLICATION_ZANATA_PROJECT_JSON, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
    public Response get();
 
    @PUT
-   @Consumes({ MediaTypes.APPLICATION_FLIES_PROJECT_XML, MediaTypes.APPLICATION_FLIES_PROJECT_JSON, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+   @Consumes({ MediaTypes.APPLICATION_ZANATA_PROJECT_XML, MediaTypes.APPLICATION_ZANATA_PROJECT_JSON, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
    public Response put(InputStream messageBody);
 
 }
\ No newline at end of file
diff --git a/common/zanata-common-api/src/main/java/org/zanata/rest/service/ProjectsResource.java b/common/zanata-common-api/src/main/java/org/zanata/rest/service/ProjectsResource.java
index bee5723f04..548808b901 100644
--- a/common/zanata-common-api/src/main/java/org/zanata/rest/service/ProjectsResource.java
+++ b/common/zanata-common-api/src/main/java/org/zanata/rest/service/ProjectsResource.java
@@ -41,8 +41,8 @@ public interface ProjectsResource
 {
 
    @GET
-   @Produces({ MediaTypes.APPLICATION_FLIES_PROJECTS_XML, MediaTypes.APPLICATION_FLIES_PROJECTS_JSON, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-   @Wrapped(element = "projects", namespace = Namespaces.FLIES)
+   @Produces({ MediaTypes.APPLICATION_ZANATA_PROJECTS_XML, MediaTypes.APPLICATION_ZANATA_PROJECTS_JSON, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+   @Wrapped(element = "projects", namespace = Namespaces.ZANATA_API)
    public List<Project> get();
 
 }
\ No newline at end of file
diff --git a/common/zanata-common-api/src/main/java/org/zanata/rest/service/TranslationResourcesResource.java b/common/zanata-common-api/src/main/java/org/zanata/rest/service/TranslationResourcesResource.java
index 3bc993960e..8a3b2b6c84 100644
--- a/common/zanata-common-api/src/main/java/org/zanata/rest/service/TranslationResourcesResource.java
+++ b/common/zanata-common-api/src/main/java/org/zanata/rest/service/TranslationResourcesResource.java
@@ -55,7 +55,7 @@ public interface TranslationResourcesResource
     * @return Response.ok with ResourcesList or Response(404) if not found
     */
    @GET
-   @Wrapped(element = "resources", namespace = Namespaces.FLIES)
+   @Wrapped(element = "resources", namespace = Namespaces.ZANATA_API)
    public Response get();
 
    @POST
diff --git a/common/zanata-common-api/src/main/java/org/zanata/rest/service/VersionResource.java b/common/zanata-common-api/src/main/java/org/zanata/rest/service/VersionResource.java
index db62df7095..8561c86731 100644
--- a/common/zanata-common-api/src/main/java/org/zanata/rest/service/VersionResource.java
+++ b/common/zanata-common-api/src/main/java/org/zanata/rest/service/VersionResource.java
@@ -36,7 +36,7 @@ public interface VersionResource
     * @return VersionInfo
     */
    @GET
-   @Produces({ MediaTypes.APPLICATION_FLIES_VERSION_JSON, MediaTypes.APPLICATION_FLIES_VERSION_XML })
+   @Produces({ MediaTypes.APPLICATION_ZANATA_VERSION_JSON, MediaTypes.APPLICATION_ZANATA_VERSION_XML })
    public VersionInfo get();
 
 }
\ No newline at end of file
diff --git a/server/zanata-war/src/main/java/org/zanata/action/ConfigurationAction.java b/server/zanata-war/src/main/java/org/zanata/action/ConfigurationAction.java
index c7b17ba239..b4b38870e3 100644
--- a/server/zanata-war/src/main/java/org/zanata/action/ConfigurationAction.java
+++ b/server/zanata-war/src/main/java/org/zanata/action/ConfigurationAction.java
@@ -68,7 +68,7 @@ public void getData()
          ServletOutputStream os = response.getOutputStream();
          StringBuilder var = new StringBuilder(
                "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n" +
-               "<config xmlns=\"" + Namespaces.FLIES_CONFIG + "\">\n");
+               "<config xmlns=\"" + Namespaces.ZANATA_CONFIG + "\">\n");
          var.append("  <url>" + applicationConfiguration.getServerPath() + "/</url>\n");
          var.append("  <project>" + projectSlug + "</project>\n");
          var.append("  <project-version>" + iterationSlug + "</project-version>\n\n");
diff --git a/server/zanata-war/src/main/java/org/zanata/rest/service/AccountService.java b/server/zanata-war/src/main/java/org/zanata/rest/service/AccountService.java
index 88b5355950..e527c7265f 100644
--- a/server/zanata-war/src/main/java/org/zanata/rest/service/AccountService.java
+++ b/server/zanata-war/src/main/java/org/zanata/rest/service/AccountService.java
@@ -81,7 +81,7 @@ public AccountService(AccountDAO accountDAO)
    @Override
    @GET
    @Produces(
-   {MediaTypes.APPLICATION_FLIES_ACCOUNT_XML, MediaTypes.APPLICATION_FLIES_ACCOUNT_JSON})
+   {MediaTypes.APPLICATION_ZANATA_ACCOUNT_XML, MediaTypes.APPLICATION_ZANATA_ACCOUNT_JSON})
    public Response get()
    {
       log.debug("HTTP GET {0}", request.getRequestURL());
@@ -100,7 +100,7 @@ public Response get()
    @Override
    @PUT
    @Consumes(
-   {MediaTypes.APPLICATION_FLIES_ACCOUNT_XML, MediaTypes.APPLICATION_FLIES_ACCOUNT_JSON})
+   {MediaTypes.APPLICATION_ZANATA_ACCOUNT_XML, MediaTypes.APPLICATION_ZANATA_ACCOUNT_JSON})
    public Response put(Account account)
    {
       log.debug("HTTP PUT {0} : \n{1}", request.getRequestURL(), account);
diff --git a/server/zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationService.java b/server/zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationService.java
index c53142e8d7..2021681c37 100644
--- a/server/zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationService.java
+++ b/server/zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationService.java
@@ -114,7 +114,7 @@ public ProjectIterationService(ProjectDAO projectDAO, ProjectIterationDAO projec
 
    @Override
    @HEAD
-   @Produces( { MediaTypes.APPLICATION_FLIES_PROJECT_ITERATION_XML, MediaTypes.APPLICATION_FLIES_PROJECT_ITERATION_JSON, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+   @Produces( { MediaTypes.APPLICATION_ZANATA_PROJECT_ITERATION_XML, MediaTypes.APPLICATION_ZANATA_PROJECT_ITERATION_JSON, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
    public Response head()
    {
       EntityTag etag = eTagUtils.generateETagForIteration(projectSlug, iterationSlug);
@@ -130,7 +130,7 @@ public Response head()
 
    @Override
    @GET
-   @Produces( { MediaTypes.APPLICATION_FLIES_PROJECT_ITERATION_XML, MediaTypes.APPLICATION_FLIES_PROJECT_ITERATION_JSON, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+   @Produces( { MediaTypes.APPLICATION_ZANATA_PROJECT_ITERATION_XML, MediaTypes.APPLICATION_ZANATA_PROJECT_ITERATION_JSON, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
    public Response get()
    {
 
@@ -152,7 +152,7 @@ public Response get()
 
    @Override
    @PUT
-   @Consumes( { MediaTypes.APPLICATION_FLIES_PROJECT_ITERATION_XML, MediaTypes.APPLICATION_FLIES_PROJECT_ITERATION_JSON, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+   @Consumes( { MediaTypes.APPLICATION_ZANATA_PROJECT_ITERATION_XML, MediaTypes.APPLICATION_ZANATA_PROJECT_ITERATION_JSON, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
    public Response put(InputStream messageBody)
    {
 
diff --git a/server/zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java b/server/zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java
index 084a4f3eca..01b9c63c6e 100644
--- a/server/zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java
+++ b/server/zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java
@@ -98,7 +98,7 @@ public ProjectService(ProjectDAO projectDAO, AccountDAO accountDAO, Identity ide
 
    @Override
    @HEAD
-   @Produces( { MediaTypes.APPLICATION_FLIES_PROJECT_XML, MediaTypes.APPLICATION_FLIES_PROJECT_JSON, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+   @Produces( { MediaTypes.APPLICATION_ZANATA_PROJECT_XML, MediaTypes.APPLICATION_ZANATA_PROJECT_JSON, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
    public Response head()
    {
       EntityTag etag = eTagUtils.generateTagForProject(projectSlug);
@@ -112,7 +112,7 @@ public Response head()
 
    @Override
    @GET
-   @Produces( { MediaTypes.APPLICATION_FLIES_PROJECT_XML, MediaTypes.APPLICATION_FLIES_PROJECT_JSON, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+   @Produces( { MediaTypes.APPLICATION_ZANATA_PROJECT_XML, MediaTypes.APPLICATION_ZANATA_PROJECT_JSON, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
    public Response get()
    {
       EntityTag etag = eTagUtils.generateTagForProject(projectSlug);
@@ -131,7 +131,7 @@ public Response get()
 
    @Override
    @PUT
-   @Consumes( { MediaTypes.APPLICATION_FLIES_PROJECT_XML, MediaTypes.APPLICATION_FLIES_PROJECT_JSON, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+   @Consumes( { MediaTypes.APPLICATION_ZANATA_PROJECT_XML, MediaTypes.APPLICATION_ZANATA_PROJECT_JSON, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
    public Response put(InputStream messageBody)
    {
 
@@ -213,7 +213,7 @@ public static Project toResource(HProject hProject, MediaType mediaType)
          {
             ProjectIteration iteration = new ProjectIteration();
             ProjectIterationService.transfer(pIt, iteration);
-            iteration.getLinks(true).add(new Link(URI.create("iterations/i/" + pIt.getSlug()), "self", MediaTypes.createFormatSpecificType(MediaTypes.APPLICATION_FLIES_PROJECT_ITERATION, mediaType)));
+            iteration.getLinks(true).add(new Link(URI.create("iterations/i/" + pIt.getSlug()), "self", MediaTypes.createFormatSpecificType(MediaTypes.APPLICATION_ZANATA_PROJECT_ITERATION, mediaType)));
             project.getIterations(true).add(iteration);
          }
       }
diff --git a/server/zanata-war/src/main/java/org/zanata/rest/service/ProjectsService.java b/server/zanata-war/src/main/java/org/zanata/rest/service/ProjectsService.java
index 7dd01710d5..c0f05806df 100644
--- a/server/zanata-war/src/main/java/org/zanata/rest/service/ProjectsService.java
+++ b/server/zanata-war/src/main/java/org/zanata/rest/service/ProjectsService.java
@@ -45,8 +45,8 @@ public class ProjectsService implements ProjectsResource
 
    @Override
    @GET
-   @Produces( { MediaTypes.APPLICATION_FLIES_PROJECTS_XML, MediaTypes.APPLICATION_FLIES_PROJECTS_JSON, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-   @Wrapped(element = "projects", namespace = Namespaces.FLIES)
+   @Produces( { MediaTypes.APPLICATION_ZANATA_PROJECTS_XML, MediaTypes.APPLICATION_ZANATA_PROJECTS_JSON, MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
+   @Wrapped(element = "projects", namespace = Namespaces.ZANATA_API)
    public List<Project> get()
    {
       @SuppressWarnings("unchecked")
@@ -57,7 +57,7 @@ public List<Project> get()
       for (HProject hProject : projects)
       {
          Project project = new Project(hProject.getSlug(), hProject.getName(), ProjectType.IterationProject);
-         project.getLinks(true).add(new Link(URI.create("p/" + hProject.getSlug()), "self", MediaTypes.createFormatSpecificType(MediaTypes.APPLICATION_FLIES_PROJECT, accept)));
+         project.getLinks(true).add(new Link(URI.create("p/" + hProject.getSlug()), "self", MediaTypes.createFormatSpecificType(MediaTypes.APPLICATION_ZANATA_PROJECT, accept)));
          projectRefs.add(project);
       }
 
diff --git a/server/zanata-war/src/main/java/org/zanata/rest/service/TranslationResourcesService.java b/server/zanata-war/src/main/java/org/zanata/rest/service/TranslationResourcesService.java
index c91013dda1..75a16860bd 100644
--- a/server/zanata-war/src/main/java/org/zanata/rest/service/TranslationResourcesService.java
+++ b/server/zanata-war/src/main/java/org/zanata/rest/service/TranslationResourcesService.java
@@ -203,7 +203,7 @@ public Response head()
     */
    @Override
    @GET
-   @Wrapped(element = "resources", namespace = Namespaces.FLIES)
+   @Wrapped(element = "resources", namespace = Namespaces.ZANATA_API)
    public Response get()
    {
 
diff --git a/server/zanata-war/src/main/java/org/zanata/rest/service/VersionService.java b/server/zanata-war/src/main/java/org/zanata/rest/service/VersionService.java
index ec5493bd56..f25b0aa93e 100644
--- a/server/zanata-war/src/main/java/org/zanata/rest/service/VersionService.java
+++ b/server/zanata-war/src/main/java/org/zanata/rest/service/VersionService.java
@@ -38,7 +38,7 @@ public VersionService()
     */
    @Override
    @GET
-   @Produces({ MediaTypes.APPLICATION_FLIES_VERSION_JSON, MediaTypes.APPLICATION_FLIES_VERSION_XML })
+   @Produces({ MediaTypes.APPLICATION_ZANATA_VERSION_JSON, MediaTypes.APPLICATION_ZANATA_VERSION_XML })
    public VersionInfo get()
    {
       return new VersionInfo(version);
diff --git a/server/zanata-war/src/main/java/org/zanata/webtrans/client/WebTransMessages.java b/server/zanata-war/src/main/java/org/zanata/webtrans/client/WebTransMessages.java
index b9cdcd9e23..55744a3baf 100644
--- a/server/zanata-war/src/main/java/org/zanata/webtrans/client/WebTransMessages.java
+++ b/server/zanata-war/src/main/java/org/zanata/webtrans/client/WebTransMessages.java
@@ -26,7 +26,7 @@ public interface WebTransMessages extends Messages
    @DefaultMessage("{0}/{1}/{2} (msgs)")
    String statusBarLabelUnits(int approved, int needReview, int untranslated);
 
-   @DefaultMessage("http://code.google.com/docreader/#p=flies&s=flies&t=TranslatorGuide")
+   @DefaultMessage("http://zanata.org/")
    String hrefHelpLink();
 
    @DefaultMessage("{0} to {1} - Zanata Web Translation")
diff --git a/server/zanata-war/src/main/resources/org/zanata/webtrans/client/WebTransMessages.properties b/server/zanata-war/src/main/resources/org/zanata/webtrans/client/WebTransMessages.properties
index 0a2009a753..0ad40a6112 100644
--- a/server/zanata-war/src/main/resources/org/zanata/webtrans/client/WebTransMessages.properties
+++ b/server/zanata-war/src/main/resources/org/zanata/webtrans/client/WebTransMessages.properties
@@ -9,7 +9,7 @@ firstPage=First Page
 
 firstPageShortcut=Home
 
-hrefHelpLink=http\://code.google.com/docreader/\#p\=flies&s\=flies&t\=TranslatorGuide
+hrefHelpLink=http\://zanata.org/
 
 lastPage=Last Page
 
diff --git a/server/zanata-war/src/main/webapp/rest/index.xrd b/server/zanata-war/src/main/webapp/rest/index.xrd
index 0f4df70aea..c79db59539 100644
--- a/server/zanata-war/src/main/webapp/rest/index.xrd
+++ b/server/zanata-war/src/main/webapp/rest/index.xrd
@@ -3,27 +3,27 @@
 
   <!-- AccountsService (not yet implemented) 
   <Link
-    type="application/vnd.flies.accounts+xml"
+    type="application/vnd.zanata.accounts+xml"
     href="accounts"/>
   -->
 
   <!-- ProjectsService -->
   <Link
-    type="application/vnd.flies.projects+xml"
+    type="application/vnd.zanata.projects+xml"
     href="projects"/>
 
   <!-- ProjectService -->
   <Link
-    type="application/vnd.flies.project+xml"
+    type="application/vnd.zanata.project+xml"
     template="projects/p/{projectSlug}"/>
 
   <!-- ProjectIterationService -->
   <Link
-    type="application/vnd.flies.project.iteration+xml"
+    type="application/vnd.zanata.project.iteration+xml"
     template="projects/p/{projectSlug}/iterations/i/{iterationSlug}"/>
 
   <!-- TranslationResourcesService -->
   <Link
-    type="application/vnd.flies.project.iteration.document+xml"
+    type="application/vnd.zanata.project.iteration.document+xml"
     template="projects/p/{projectSlug}/iterations/i/{iterationSlug}/r"/>
 </XRD>
diff --git a/server/zanata-war/src/test/java/org/zanata/rest/service/ProjectServiceRawSeamTest.java b/server/zanata-war/src/test/java/org/zanata/rest/service/ProjectServiceRawSeamTest.java
index ec3f199644..6ee5d88fcf 100644
--- a/server/zanata-war/src/test/java/org/zanata/rest/service/ProjectServiceRawSeamTest.java
+++ b/server/zanata-war/src/test/java/org/zanata/rest/service/ProjectServiceRawSeamTest.java
@@ -83,7 +83,7 @@ public void retrieveListOfProjectsAsXml() throws Exception
          @Override
          protected void prepareRequest(EnhancedMockHttpServletRequest request)
          {
-            request.addHeader("Accept", MediaTypes.APPLICATION_FLIES_PROJECTS_XML);
+            request.addHeader("Accept", MediaTypes.APPLICATION_ZANATA_PROJECTS_XML);
          }
 
          @Override
diff --git a/server/zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java b/server/zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
index e50bb60127..4ea516ee6d 100644
--- a/server/zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
+++ b/server/zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
@@ -360,7 +360,7 @@ public void putNewDocument()
        * 
        * link = doc.getLinks().findLinkByRel(Relationships.DOCUMENT_CONTAINER);
        * assertThat(link, notNullValue()); assertThat(link.getType(),
-       * is(MediaTypes.APPLICATION_FLIES_PROJECT_ITERATION_XML));
+       * is(MediaTypes.APPLICATION_ZANATA_PROJECT_ITERATION_XML));
        */
    }