diff --git a/compose/ponsim-adapters.yml b/compose/adapters-ponsim.yml
similarity index 88%
rename from compose/ponsim-adapters.yml
rename to compose/adapters-ponsim.yml
index 0e4b9f8..dacf83c 100644
--- a/compose/ponsim-adapters.yml
+++ b/compose/adapters-ponsim.yml
@@ -15,8 +15,8 @@
 
 version: '2'
 services:
-  ponsim_olt_adapter:
-    image: "${REGISTRY}${REPOSITORY}voltha-ponsim-adapter-olt${TAG}"
+  adapter_ponsim_olt:
+    image: "${REGISTRY}${REPOSITORY}voltha-adapter-ponsim-olt${TAG}"
     logging:
       driver: "json-file"
       options:
@@ -33,8 +33,8 @@
     networks:
     - default
 
-  ponsim_onu_adapter:
-    image: "${REGISTRY}${REPOSITORY}voltha-ponsim-adapter-onu${TAG}"
+  adapter_ponsim_onu:
+    image: "${REGISTRY}${REPOSITORY}voltha-adapter-ponsim-onu${TAG}"
     logging:
       driver: "json-file"
       options:
diff --git a/compose/ponsim.yml b/compose/ponsim.yml
deleted file mode 100644
index cae0cb4..0000000
--- a/compose/ponsim.yml
+++ /dev/null
@@ -1,72 +0,0 @@
----
-# Copyright 2018 the original author or authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-version: '2'
-services:
-  ponsim_olt:
-    image: "${REGISTRY}${REPOSITORY}voltha-ponsim${TAG}"
-    logging:
-      driver: "json-file"
-      options:
-        max-size: "10m"
-        max-file: "3"
-    entrypoint:
-      - /app/ponsim
-      - -device_type
-      - "OLT"
-      - -onus
-      - "4"
-      - -internal_if
-      - "eth0"
-      - -external_if
-      - "eth0"
-      - -vcore_endpoint
-      - "vcore"
-      - -promiscuous
-      - -verbose
-    ports:
-      - "50060:50060"
-    networks:
-    - default
-
-  ponsim_onu:
-    image: "${REGISTRY}${REPOSITORY}voltha-ponsim${TAG}"
-    logging:
-      driver: "json-file"
-      options:
-        max-size: "10m"
-        max-file: "3"
-    entrypoint:
-      - /app/ponsim
-      - -device_type
-      - "ONU"
-      - -parent_addr
-      - "ponsim_olt"
-      - -grpc_port
-      - "50061"
-      - -internal_if
-      - "eth0"
-      - -external_if
-      - "lo"
-      - -promiscuous
-      - -verbose
-    ports:
-    - "50061:50061"
-    networks:
-    - default
-
-networks:
-  default:
-    driver: bridge