diff --git a/configs/node/api-flow-config.js b/configs/node/api-flow-config.js
index f6cad0f..990c6e0 100644
--- a/configs/node/api-flow-config.js
+++ b/configs/node/api-flow-config.js
@@ -2,34 +2,34 @@ import Environment from '../../src/environments/node/Environment'
 
 import SwaggerLoader from '../../src/loaders/swagger/Loader'
 import RAMLLoader from '../../src/loaders/raml/Loader'
-import PostmanV2Loader from '../../src/loaders/postman/v2.0/Loader'
+import PostmanCollectionV2Loader from '../../src/loaders/postman/v2.0/Loader'
 
 import SwaggerV2Parser from '../../src/parsers/swagger/v2.0/Parser'
 import RAMLV1Parser from '../../src/parsers/raml/v1.0/Parser'
-import PostmanV2Parser from '../../src/loaders/postman/v2.0/Parser'
+import PostmanCollectionV2Serializer from '../../src/serializers/postman/v2.0/Serializer'
 
 import SwaggerV2Serializer from '../../src/serializers/swagger/v2.0/Serializer'
 import RAMLV1Serializer from '../../src/serializers/raml/v1.0/Serializer'
-import PostmanV2Serializer from '../../src/serializers/postman/v2.0/Serializer'
+import PostmanCollectionV2Parser from '../../src/serializers/postman/v2.0/Serializer'
 import InternalSerializer from '../../src/serializers/internal/Serializer'
 
 export const loaders = [
   SwaggerLoader,
   RAMLLoader,
-  PostmanV2Loader
+  PostmanCollectionV2Loader
 ]
 
 export const parsers = [
   SwaggerV2Parser,
   RAMLV1Parser,
-  PostmanV2Parser
+  PostmanCollectionV2Parser
 ]
 
 export const serializers = [
   SwaggerV2Serializer,
   RAMLV1Serializer,
   InternalSerializer,
-  PostmanV2Serializer
+  PostmanCollectionV2Serializer
 ]
 
 export const environment = Environment
diff --git a/configs/web/api-flow-config.js b/configs/web/api-flow-config.js
index 12e25e9..b0674d0 100644
--- a/configs/web/api-flow-config.js
+++ b/configs/web/api-flow-config.js
@@ -2,11 +2,11 @@ import Environment from '../../src/environments/web/Environment'
 
 import SwaggerLoader from '../../src/loaders/swagger/Loader'
 import RAMLLoader from '../../src/loaders/raml/Loader'
-import PostmanV2Loader from '../../src/loaders/postman/v2.0/Loader'
+import PostmanCollectionV2Loader from '../../src/loaders/postman/v2.0/Loader'
 
 import SwaggerV2Parser from '../../src/parsers/swagger/v2.0/Parser'
 import RAMLV1Parser from '../../src/parsers/raml/v1.0/Parser'
-import PostmanV2Parser from '../../src/loaders/postman/v2.0/Parser'
+import PostmanCollectionV2Serializer from '../../src/serializers/postman/v2.0/Serializer'
 
 import SwaggerV2Serializer from '../../src/serializers/swagger/v2.0/Serializer'
 import RAMLV1Serializer from '../../src/serializers/raml/v1.0/Serializer'
@@ -16,20 +16,19 @@ import InternalSerializer from '../../src/serializers/internal/Serializer'
 export const loaders = [
   SwaggerLoader,
   RAMLLoader,
-  PostmanV2Loader
+  PostmanCollectionV2Loader
 ]
 
 export const parsers = [
   SwaggerV2Parser,
   RAMLV1Parser,
-  PostmanV2Parser
-]
+  PostmanCollectionV2Parser
 
 export const serializers = [
   SwaggerV2Serializer,
   RAMLV1Serializer,
   InternalSerializer,
-  PostmanV2Serializer
+  PostmanCollectionV2Serializer
 ]
 
 export const environment = Environment
diff --git a/configs/webworker/api-flow-config.js b/configs/webworker/api-flow-config.js
index 12e25e9..8c5129f 100644
--- a/configs/webworker/api-flow-config.js
+++ b/configs/webworker/api-flow-config.js
@@ -2,7 +2,7 @@ import Environment from '../../src/environments/web/Environment'
 
 import SwaggerLoader from '../../src/loaders/swagger/Loader'
 import RAMLLoader from '../../src/loaders/raml/Loader'
-import PostmanV2Loader from '../../src/loaders/postman/v2.0/Loader'
+import PostmanCollectionV2Loader from '../../src/loaders/postman/v2.0/Loader'
 
 import SwaggerV2Parser from '../../src/parsers/swagger/v2.0/Parser'
 import RAMLV1Parser from '../../src/parsers/raml/v1.0/Parser'
@@ -10,26 +10,26 @@ import PostmanV2Parser from '../../src/loaders/postman/v2.0/Parser'
 
 import SwaggerV2Serializer from '../../src/serializers/swagger/v2.0/Serializer'
 import RAMLV1Serializer from '../../src/serializers/raml/v1.0/Serializer'
-import PostmanV2Serializer from '../../src/serializers/postman/v2.0/Serializer'
+import PostmanCollectionV2Serializer from '../../src/serializers/postman/v2.0/Serializer'
 import InternalSerializer from '../../src/serializers/internal/Serializer'
 
 export const loaders = [
   SwaggerLoader,
   RAMLLoader,
-  PostmanV2Loader
+  PostmanCollectionV2Loader
 ]
 
 export const parsers = [
   SwaggerV2Parser,
   RAMLV1Parser,
-  PostmanV2Parser
+  PostmanCollectionV2Parser
 ]
 
 export const serializers = [
   SwaggerV2Serializer,
   RAMLV1Serializer,
   InternalSerializer,
-  PostmanV2Serializer
+  PostmanCollectionV2Serializer
 ]
 
 export const environment = Environment
diff --git a/configs/webworker/webpack.config.babel.js b/configs/webworker/webpack.config.babel.js
index f47ef76..df6072b 100644
--- a/configs/webworker/webpack.config.babel.js
+++ b/configs/webworker/webpack.config.babel.js
@@ -4,7 +4,7 @@ const config = {
   target: 'webworker',
   entry: path.resolve(__dirname, './api-flow.js'),
   output: {
-    path: path.resolve(__dirname, '../../../dist/node/'),
+    path: path.resolve(__dirname, '../../../dist/webworker/'),
     filename: 'api-flow.js',
     libraryTarget: 'umd'
   },
diff --git a/src/api-flow-config.js b/src/api-flow-config.js
index f7500aa..5d7b0ce 100644
--- a/src/api-flow-config.js
+++ b/src/api-flow-config.js
@@ -13,7 +13,7 @@ import PostmanCollectionV2Parser from './parsers/postman/v2.0/Parser'
 import SwaggerV2Serializer from './serializers/swagger/v2.0/Serializer'
 import RAMLV1Serializer from './serializers/raml/v1.0/Serializer'
 import InternalSerializer from './serializers/internal/Serializer'
-import PostmanV2Serializer from './serializers/postman/v2.0/Serializer'
+import PostmanCollectionV2Serializer from './serializers/postman/v2.0/Serializer'
 import ApiBlueprint1ASerializer from './serializers/api-blueprint/1A/Serializer'
 
 export const loaders = [
@@ -34,7 +34,7 @@ export const serializers = [
   SwaggerV2Serializer,
   RAMLV1Serializer,
   InternalSerializer,
-  PostmanV2Serializer,
+  PostmanCollectionV2Serializer,
   ApiBlueprint1ASerializer
 ]