diff --git a/src/lib.ts b/src/lib.ts
index 8961c189..90817902 100644
--- a/src/lib.ts
+++ b/src/lib.ts
@@ -12,8 +12,8 @@ import * as utils from './utils'
 export * from './ddo/DDO'
 export * from './ddo/MetaData'
 
-export { CreateProgressStep } from './ocean/OceanAssets'
-export { ComputeJob, ComputeJobStatus } from './ocean/Compute'
+export { CreateProgressStep } from './ocean/Assets'
+export { ComputeJob, ComputeJobStatus } from './ocean/OceanCompute'
 export { OrderProgressStep } from './ocean/utils/ServiceUtils'
 export {
     OceanPlatformTechStatus,
diff --git a/src/ocean/Assets.ts b/src/ocean/Assets.ts
index ebb50697..6555821e 100644
--- a/src/ocean/Assets.ts
+++ b/src/ocean/Assets.ts
@@ -23,13 +23,13 @@ export enum CreateProgressStep {
 /**
  * Assets submodule of Ocean Protocol.
  */
-export class OceanAssets extends Instantiable {
+export class Assets extends Instantiable {
     /**
-     * Returns the instance of OceanAssets.
-     * @return {Promise<OceanAssets>}
+     * Returns the instance of Assets.
+     * @return {Promise<Assets>}
      */
-    public static async getInstance(config: InstantiableConfig): Promise<OceanAssets> {
-        const instance = new OceanAssets()
+    public static async getInstance(config: InstantiableConfig): Promise<Assets> {
+        const instance = new Assets()
         instance.setInstanceConfig(config)
 
         return instance
diff --git a/src/ocean/Ocean.ts b/src/ocean/Ocean.ts
index 9a57b4ce..18d76335 100644
--- a/src/ocean/Ocean.ts
+++ b/src/ocean/Ocean.ts
@@ -10,14 +10,14 @@ import { OceanUtils } from './utils/OceanUtils'
 
 import { Aquarius } from '../aquarius/Aquarius'
 import { Brizo } from '../brizo/Brizo'
-
+import { DataTokens } from '../datatokens/Datatokens'
 import { Config } from '../models/Config'
 
 import {
     Instantiable,
     generateIntantiableConfigFromConfig
 } from '../Instantiable.abstract'
-import { DataTokens } from '../lib'
+
 
 /**
  * Main interface for Ocean Protocol.
@@ -47,7 +47,7 @@ export class Ocean extends Instantiable {
 
         instance.accounts = await OceanAccounts.getInstance(instanceConfig)
         instance.auth = await OceanAuth.getInstance(instanceConfig)
-        instance.assets = await OceanAssets.getInstance(instanceConfig)
+        instance.assets = await Assets.getInstance(instanceConfig)
         instance.compute = await Compute.getInstance(instanceConfig)
         instance.datatokens = new DataTokens(
             instanceConfig.config.factoryAddress,
@@ -87,9 +87,9 @@ export class Ocean extends Instantiable {
 
     /**
      * Ocean assets submodule
-     * @type {OceanAssets}
+     * @type {Assets}
      */
-    public assets: OceanAssets
+    public assets: Assets
 
     /**
      * Ocean compute submodule