diff --git a/.github/workflows/acceptance-stage.yml b/.github/workflows/acceptance-stage.yml
index f04668e..2df2d80 100644
--- a/.github/workflows/acceptance-stage.yml
+++ b/.github/workflows/acceptance-stage.yml
@@ -9,7 +9,7 @@ concurrency: acceptance
 env:
   OWNER: flawmop
   REGISTRY: ghcr.io
-  APP_REPO: run-input-processing-svc
+  APP_REPO: simulation-svc
   DEPLOY_REPO: portal-deploy
   VERSION: ${{ github.sha }}
 
diff --git a/.github/workflows/commit-stage.yml b/.github/workflows/commit-stage.yml
index deeb207..f108e9d 100644
--- a/.github/workflows/commit-stage.yml
+++ b/.github/workflows/commit-stage.yml
@@ -4,8 +4,8 @@ on: push
 env:
   OWNER: flawmop
   REGISTRY: ghcr.io
-  IMAGE_NAME: flawmop/run-input-processing-svc
-  APP_REPO: run-input-processing-svc
+  IMAGE_NAME: flawmop/simulation-svc
+  APP_REPO: simulation-svc
   DEPLOY_REPO: portal-deploy
   VERSION: ${{ github.sha }}
 
diff --git a/README.md b/README.md
index 4584bb2..5fbb61f 100644
--- a/README.md
+++ b/README.md
@@ -1 +1 @@
-Run Input Processing Service
+Simulation Service
diff --git a/k8s/deployment.yml b/k8s/deployment.yml
index 2ee847b..ad9eae8 100644
--- a/k8s/deployment.yml
+++ b/k8s/deployment.yml
@@ -1,22 +1,22 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: run-input-processing-svc
+  name: simulation-svc
   labels:
-    app: run-input-processing-svc
+    app: simulation-svc
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: run-input-processing-svc
+      app: simulation-svc
   template:
     metadata:
       labels:
-        app: run-input-processing-svc
+        app: simulation-svc
     spec:
       containers:
-        - name: run-input-processing-svc
-          image: ghcr.io/flawmop/run-input-processing-svc
+        - name: simulation-svc
+          image: ghcr.io/flawmop/simulation-svc
           imagePullPolicy: IfNotPresent
           lifecycle:
             preStop:
@@ -25,9 +25,9 @@ spec:
           ports:
             - containerPort: 9002
           volumeMounts:
-            - name: run-input-processing-config-volume
+            - name: simulation-config-volume
               mountPath: /workspace/config
       volumes:
-        - name: run-input-processing-config-volume
+        - name: simulation-config-volume
           configMap:
-            name: run-input-processing-config
+            name: simulation-config
diff --git a/k8s/kustomization.yml b/k8s/kustomization.yml
index 6f66f52..03eb209 100644
--- a/k8s/kustomization.yml
+++ b/k8s/kustomization.yml
@@ -6,11 +6,11 @@ resources:
   - service.yml
 
 configMapGenerator:
-  - name: run-input-processing-config
+  - name: simulation-config
     files:
       - application.yml
 
 generatorOptions:
   #disableNameSuffixHash: true
   labels:
-    app: run-input-processing-svc
+    app: simulation-svc
diff --git a/k8s/service.yml b/k8s/service.yml
index 98f7041..838ede5 100644
--- a/k8s/service.yml
+++ b/k8s/service.yml
@@ -1,13 +1,13 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: run-input-processing-svc
+  name: simulation-svc
   labels:
-    app: run-input-processing-svc
+    app: simulation-svc
 spec:
   type: ClusterIP
   selector:
-    app: run-input-processing-svc
+    app: simulation-svc
   ports:
   - protocol: TCP
     port: 80
diff --git a/src/main/java/com/insilicosoft/portal/svc/rip/RipIdentifiers.java b/src/main/java/com/insilicosoft/portal/svc/simulation/SimulationIdentifiers.java
similarity index 64%
rename from src/main/java/com/insilicosoft/portal/svc/rip/RipIdentifiers.java
rename to src/main/java/com/insilicosoft/portal/svc/simulation/SimulationIdentifiers.java
index 7d56dbe..e99e8bc 100644
--- a/src/main/java/com/insilicosoft/portal/svc/rip/RipIdentifiers.java
+++ b/src/main/java/com/insilicosoft/portal/svc/simulation/SimulationIdentifiers.java
@@ -1,14 +1,13 @@
-package com.insilicosoft.portal.svc.rip;
+package com.insilicosoft.portal.svc.simulation;
 
-public final class RipIdentifiers {
+public final class SimulationIdentifiers {
 
   /** Also used in {@code application.yml} */
   public static final String BINDING_NAME_SIMULATION_INPUT = "simulation-input";
   public static final String PARAM_NAME_SIMULATION_FILE = "mpfile";
   public static final String REQUEST_MAPPING_SIMULATION = "/simulation";
-  public static final String REQUEST_MAPPING_SUBMISSION = "/submission";
   public static final String ROLE_USER = "user";
 
-  private RipIdentifiers() {}
+  private SimulationIdentifiers() {}
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/insilicosoft/portal/svc/rip/RipSvcApplication.java b/src/main/java/com/insilicosoft/portal/svc/simulation/SimulationSvcApplication.java
similarity index 56%
rename from src/main/java/com/insilicosoft/portal/svc/rip/RipSvcApplication.java
rename to src/main/java/com/insilicosoft/portal/svc/simulation/SimulationSvcApplication.java
index 8006fc9..35a6641 100644
--- a/src/main/java/com/insilicosoft/portal/svc/rip/RipSvcApplication.java
+++ b/src/main/java/com/insilicosoft/portal/svc/simulation/SimulationSvcApplication.java
@@ -1,13 +1,13 @@
-package com.insilicosoft.portal.svc.rip;
+package com.insilicosoft.portal.svc.simulation;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
-public class RipSvcApplication {
+public class SimulationSvcApplication {
 
   public static void main(String[] args) {
-    SpringApplication.run(RipSvcApplication.class, args);
+    SpringApplication.run(SimulationSvcApplication.class, args);
   }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/insilicosoft/portal/svc/rip/config/AsyncConfig.java b/src/main/java/com/insilicosoft/portal/svc/simulation/config/AsyncConfig.java
similarity index 97%
rename from src/main/java/com/insilicosoft/portal/svc/rip/config/AsyncConfig.java
rename to src/main/java/com/insilicosoft/portal/svc/simulation/config/AsyncConfig.java
index f358fb2..b57a755 100644
--- a/src/main/java/com/insilicosoft/portal/svc/rip/config/AsyncConfig.java
+++ b/src/main/java/com/insilicosoft/portal/svc/simulation/config/AsyncConfig.java
@@ -1,4 +1,4 @@
-package com.insilicosoft.portal.svc.rip.config;
+package com.insilicosoft.portal.svc.simulation.config;
 
 import org.slf4j.Logger ;
 import org.slf4j.LoggerFactory ;
diff --git a/src/main/java/com/insilicosoft/portal/svc/rip/config/JpaAuditingConfig.java b/src/main/java/com/insilicosoft/portal/svc/simulation/config/JpaAuditingConfig.java
similarity index 95%
rename from src/main/java/com/insilicosoft/portal/svc/rip/config/JpaAuditingConfig.java
rename to src/main/java/com/insilicosoft/portal/svc/simulation/config/JpaAuditingConfig.java
index b1ba6d6..bdedf4d 100644
--- a/src/main/java/com/insilicosoft/portal/svc/rip/config/JpaAuditingConfig.java
+++ b/src/main/java/com/insilicosoft/portal/svc/simulation/config/JpaAuditingConfig.java
@@ -1,4 +1,4 @@
-package com.insilicosoft.portal.svc.rip.config;
+package com.insilicosoft.portal.svc.simulation.config;
 
 import java.util.Optional;
 
diff --git a/src/main/java/com/insilicosoft/portal/svc/rip/config/SecurityConfig.java b/src/main/java/com/insilicosoft/portal/svc/simulation/config/SecurityConfig.java
similarity index 94%
rename from src/main/java/com/insilicosoft/portal/svc/rip/config/SecurityConfig.java
rename to src/main/java/com/insilicosoft/portal/svc/simulation/config/SecurityConfig.java
index 35dd44d..6a7a7a8 100644
--- a/src/main/java/com/insilicosoft/portal/svc/rip/config/SecurityConfig.java
+++ b/src/main/java/com/insilicosoft/portal/svc/simulation/config/SecurityConfig.java
@@ -1,4 +1,4 @@
-package com.insilicosoft.portal.svc.rip.config;
+package com.insilicosoft.portal.svc.simulation.config;
 
 import static org.springframework.security.config.http.SessionCreationPolicy.STATELESS;
 import static org.springframework.security.config.Customizer.withDefaults;
@@ -22,7 +22,7 @@
 import org.springframework.security.provisioning.InMemoryUserDetailsManager;
 import org.springframework.security.web.SecurityFilterChain;
 
-import com.insilicosoft.portal.svc.rip.RipIdentifiers;
+import com.insilicosoft.portal.svc.simulation.SimulationIdentifiers;
 
 /**
  * Security configuration.
@@ -53,8 +53,8 @@ SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
     http.authorizeHttpRequests((authz) -> authz.requestMatchers(EndpointRequest.to(InfoEndpoint.class),
                                                                 EndpointRequest.to(MetricsEndpoint.class),
                                                                 EndpointRequest.to(PrometheusScrapeEndpoint.class)).authenticated()
-                                               .requestMatchers(RipIdentifiers.REQUEST_MAPPING_SUBMISSION.concat("/**"))
-                                                               .hasRole(RipIdentifiers.ROLE_USER))
+                                               .requestMatchers(SimulationIdentifiers.REQUEST_MAPPING_SIMULATION.concat("/**"))
+                                                               .hasRole(SimulationIdentifiers.ROLE_USER))
         .oauth2ResourceServer((oauth2) -> oauth2.jwt(withDefaults()))
         .sessionManagement(sessionManagement -> sessionManagement.sessionCreationPolicy(STATELESS))
         .csrf(AbstractHttpConfigurer::disable)
diff --git a/src/main/java/com/insilicosoft/portal/svc/rip/controller/SubmissionController.java b/src/main/java/com/insilicosoft/portal/svc/simulation/controller/SimulationController.java
similarity index 71%
rename from src/main/java/com/insilicosoft/portal/svc/rip/controller/SubmissionController.java
rename to src/main/java/com/insilicosoft/portal/svc/simulation/controller/SimulationController.java
index cfdde24..9019319 100644
--- a/src/main/java/com/insilicosoft/portal/svc/rip/controller/SubmissionController.java
+++ b/src/main/java/com/insilicosoft/portal/svc/simulation/controller/SimulationController.java
@@ -1,4 +1,4 @@
-package com.insilicosoft.portal.svc.rip.controller;
+package com.insilicosoft.portal.svc.simulation.controller;
 
 import java.io.IOException ;
 
@@ -12,24 +12,24 @@
 import org.springframework.web.bind.annotation.RequestPart ;
 import org.springframework.web.multipart.MultipartFile;
 
-import com.insilicosoft.portal.svc.rip.RipIdentifiers;
-import com.insilicosoft.portal.svc.rip.exception.FileProcessingException;
-import com.insilicosoft.portal.svc.rip.exception.InputVerificationException;
-import com.insilicosoft.portal.svc.rip.service.InputProcessorService;
-import com.insilicosoft.portal.svc.rip.service.SubmissionService;
+import com.insilicosoft.portal.svc.simulation.SimulationIdentifiers;
+import com.insilicosoft.portal.svc.simulation.exception.FileProcessingException;
+import com.insilicosoft.portal.svc.simulation.exception.InputVerificationException;
+import com.insilicosoft.portal.svc.simulation.service.InputProcessorService;
+import com.insilicosoft.portal.svc.simulation.service.SubmissionService;
 
 import io.micrometer.core.annotation.Timed;
 
 /**
- * Submission controller
+ * Simulation controller
  *
  * @author geoff
  */
 @Controller
-@RequestMapping(RipIdentifiers.REQUEST_MAPPING_SUBMISSION)
-public class SubmissionController {
+@RequestMapping(SimulationIdentifiers.REQUEST_MAPPING_SIMULATION)
+public class SimulationController {
 
-  private static final Logger log = LoggerFactory.getLogger(SubmissionController.class);
+  private static final Logger log = LoggerFactory.getLogger(SimulationController.class);
 
   private final InputProcessorService inputProcessorService;
   private final SubmissionService submissionService;
@@ -40,14 +40,14 @@ public class SubmissionController {
    * @param inputProcessorService Input processing implementation.
    * @param submissionService Submission service.
    */
-  public SubmissionController(final InputProcessorService inputProcessorService,
+  public SimulationController(final InputProcessorService inputProcessorService,
                               final SubmissionService submissionService) {
     this.inputProcessorService = inputProcessorService;
     this.submissionService = submissionService;
   }
 
   @GetMapping()
-  @Timed(value = "submission.get", description = "GET request")
+  @Timed(value = "simulation.get", description = "GET request")
   public ResponseEntity<String> get() {
     return ResponseEntity.ok(inputProcessorService.get());
   }
@@ -59,16 +59,16 @@ public ResponseEntity<String> get() {
    * @return Response entity.
    * @throws FileProcessingException If problems processing file.
    */
-  @PostMapping(RipIdentifiers.REQUEST_MAPPING_SIMULATION)
-  @Timed(value = "submission.simulation", description = "Simulation POST Multipart request")
+  @PostMapping()
+  @Timed(value = "simulation.post", description = "Simulation POST Multipart request")
   public ResponseEntity<String> createSimulation(final @RequestPart(required=false,
-                                                                    value=RipIdentifiers.PARAM_NAME_SIMULATION_FILE)
+                                                                    value=SimulationIdentifiers.PARAM_NAME_SIMULATION_FILE)
                                                        MultipartFile file)
                                                  throws FileProcessingException,
                                                         InputVerificationException {
 
     if (file == null) {
-      final String message = "No Multipart file! Did you supply the parameter '" + RipIdentifiers.PARAM_NAME_SIMULATION_FILE + "' in the POST request?";
+      final String message = "No Multipart file! Did you supply the parameter '" + SimulationIdentifiers.PARAM_NAME_SIMULATION_FILE + "' in the POST request?";
       log.warn("~createSimulation() : ".concat(message));
       throw new FileProcessingException(message);
     }
diff --git a/src/main/java/com/insilicosoft/portal/svc/rip/controller/advice/ControllerAdvice.java b/src/main/java/com/insilicosoft/portal/svc/simulation/controller/advice/ControllerAdvice.java
similarity index 89%
rename from src/main/java/com/insilicosoft/portal/svc/rip/controller/advice/ControllerAdvice.java
rename to src/main/java/com/insilicosoft/portal/svc/simulation/controller/advice/ControllerAdvice.java
index a49c9fa..49fcd3f 100644
--- a/src/main/java/com/insilicosoft/portal/svc/rip/controller/advice/ControllerAdvice.java
+++ b/src/main/java/com/insilicosoft/portal/svc/simulation/controller/advice/ControllerAdvice.java
@@ -1,4 +1,4 @@
-package com.insilicosoft.portal.svc.rip.controller.advice;
+package com.insilicosoft.portal.svc.simulation.controller.advice;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -7,8 +7,8 @@
 import org.springframework.web.multipart.MaxUploadSizeExceededException;
 import org.springframework.web.multipart.MultipartException;
 
-import com.insilicosoft.portal.svc.rip.exception.FileProcessingException;
-import com.insilicosoft.portal.svc.rip.exception.InputVerificationException;
+import com.insilicosoft.portal.svc.simulation.exception.FileProcessingException;
+import com.insilicosoft.portal.svc.simulation.exception.InputVerificationException;
 
 /**
  * REST controller advice.
diff --git a/src/main/java/com/insilicosoft/portal/svc/rip/event/SimulationMessage.java b/src/main/java/com/insilicosoft/portal/svc/simulation/event/SimulationMessage.java
similarity index 90%
rename from src/main/java/com/insilicosoft/portal/svc/rip/event/SimulationMessage.java
rename to src/main/java/com/insilicosoft/portal/svc/simulation/event/SimulationMessage.java
index 9cd41c4..a04bca5 100644
--- a/src/main/java/com/insilicosoft/portal/svc/rip/event/SimulationMessage.java
+++ b/src/main/java/com/insilicosoft/portal/svc/simulation/event/SimulationMessage.java
@@ -1,4 +1,4 @@
-package com.insilicosoft.portal.svc.rip.event;
+package com.insilicosoft.portal.svc.simulation.event;
 
 import java.math.BigDecimal;
 import java.util.List;
diff --git a/src/main/java/com/insilicosoft/portal/svc/rip/exception/FileProcessingException.java b/src/main/java/com/insilicosoft/portal/svc/simulation/exception/FileProcessingException.java
similarity index 89%
rename from src/main/java/com/insilicosoft/portal/svc/rip/exception/FileProcessingException.java
rename to src/main/java/com/insilicosoft/portal/svc/simulation/exception/FileProcessingException.java
index b997180..193e2c4 100644
--- a/src/main/java/com/insilicosoft/portal/svc/rip/exception/FileProcessingException.java
+++ b/src/main/java/com/insilicosoft/portal/svc/simulation/exception/FileProcessingException.java
@@ -1,4 +1,4 @@
-package com.insilicosoft.portal.svc.rip.exception;
+package com.insilicosoft.portal.svc.simulation.exception;
 
 /**
  * File processing exception.
diff --git a/src/main/java/com/insilicosoft/portal/svc/rip/exception/InputVerificationException.java b/src/main/java/com/insilicosoft/portal/svc/simulation/exception/InputVerificationException.java
similarity index 89%
rename from src/main/java/com/insilicosoft/portal/svc/rip/exception/InputVerificationException.java
rename to src/main/java/com/insilicosoft/portal/svc/simulation/exception/InputVerificationException.java
index 9042b72..4546dbf 100644
--- a/src/main/java/com/insilicosoft/portal/svc/rip/exception/InputVerificationException.java
+++ b/src/main/java/com/insilicosoft/portal/svc/simulation/exception/InputVerificationException.java
@@ -1,4 +1,4 @@
-package com.insilicosoft.portal.svc.rip.exception;
+package com.insilicosoft.portal.svc.simulation.exception;
 
 /**
  * Input verification exception.
diff --git a/src/main/java/com/insilicosoft/portal/svc/rip/persistence/State.java b/src/main/java/com/insilicosoft/portal/svc/simulation/persistence/State.java
similarity index 54%
rename from src/main/java/com/insilicosoft/portal/svc/rip/persistence/State.java
rename to src/main/java/com/insilicosoft/portal/svc/simulation/persistence/State.java
index 156a80c..fabc5ba 100644
--- a/src/main/java/com/insilicosoft/portal/svc/rip/persistence/State.java
+++ b/src/main/java/com/insilicosoft/portal/svc/simulation/persistence/State.java
@@ -1,4 +1,4 @@
-package com.insilicosoft.portal.svc.rip.persistence;
+package com.insilicosoft.portal.svc.simulation.persistence;
 
 public enum State {
   APPROVED, COMPLETED, CREATED, FAILED, REJECTED
diff --git a/src/main/java/com/insilicosoft/portal/svc/rip/persistence/entity/Message.java b/src/main/java/com/insilicosoft/portal/svc/simulation/persistence/entity/Message.java
similarity index 83%
rename from src/main/java/com/insilicosoft/portal/svc/rip/persistence/entity/Message.java
rename to src/main/java/com/insilicosoft/portal/svc/simulation/persistence/entity/Message.java
index b0718fd..af36db7 100644
--- a/src/main/java/com/insilicosoft/portal/svc/rip/persistence/entity/Message.java
+++ b/src/main/java/com/insilicosoft/portal/svc/simulation/persistence/entity/Message.java
@@ -1,6 +1,6 @@
-package com.insilicosoft.portal.svc.rip.persistence.entity;
+package com.insilicosoft.portal.svc.simulation.persistence.entity;
 
-import com.insilicosoft.portal.svc.rip.value.MessageLevel;
+import com.insilicosoft.portal.svc.simulation.value.MessageLevel;
 
 import jakarta.persistence.Embeddable;
 import jakarta.persistence.EnumType;
diff --git a/src/main/java/com/insilicosoft/portal/svc/rip/persistence/entity/Simulation.java b/src/main/java/com/insilicosoft/portal/svc/simulation/persistence/entity/Simulation.java
similarity index 96%
rename from src/main/java/com/insilicosoft/portal/svc/rip/persistence/entity/Simulation.java
rename to src/main/java/com/insilicosoft/portal/svc/simulation/persistence/entity/Simulation.java
index 5791f6b..bc0c6f8 100644
--- a/src/main/java/com/insilicosoft/portal/svc/rip/persistence/entity/Simulation.java
+++ b/src/main/java/com/insilicosoft/portal/svc/simulation/persistence/entity/Simulation.java
@@ -1,4 +1,4 @@
-package com.insilicosoft.portal.svc.rip.persistence.entity;
+package com.insilicosoft.portal.svc.simulation.persistence.entity;
 
 import static jakarta.persistence.GenerationType.IDENTITY;
 
@@ -12,8 +12,8 @@
 
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
-import com.insilicosoft.portal.svc.rip.event.SimulationMessage;
-import com.insilicosoft.portal.svc.rip.value.MessageLevel;
+import com.insilicosoft.portal.svc.simulation.event.SimulationMessage;
+import com.insilicosoft.portal.svc.simulation.value.MessageLevel;
 
 import jakarta.persistence.CollectionTable;
 import jakarta.persistence.Column;
diff --git a/src/main/java/com/insilicosoft/portal/svc/rip/persistence/entity/Submission.java b/src/main/java/com/insilicosoft/portal/svc/simulation/persistence/entity/Submission.java
similarity index 95%
rename from src/main/java/com/insilicosoft/portal/svc/rip/persistence/entity/Submission.java
rename to src/main/java/com/insilicosoft/portal/svc/simulation/persistence/entity/Submission.java
index b01aa4e..994d5fc 100644
--- a/src/main/java/com/insilicosoft/portal/svc/rip/persistence/entity/Submission.java
+++ b/src/main/java/com/insilicosoft/portal/svc/simulation/persistence/entity/Submission.java
@@ -1,4 +1,4 @@
-package com.insilicosoft.portal.svc.rip.persistence.entity;
+package com.insilicosoft.portal.svc.simulation.persistence.entity;
 
 import static jakarta.persistence.GenerationType.IDENTITY;
 
@@ -11,7 +11,7 @@
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
-import com.insilicosoft.portal.svc.rip.persistence.State;
+import com.insilicosoft.portal.svc.simulation.persistence.State;
 
 import jakarta.persistence.CollectionTable;
 import jakarta.persistence.Column;
diff --git a/src/main/java/com/insilicosoft/portal/svc/rip/persistence/repository/SimulationRepository.java b/src/main/java/com/insilicosoft/portal/svc/simulation/persistence/repository/SimulationRepository.java
similarity index 60%
rename from src/main/java/com/insilicosoft/portal/svc/rip/persistence/repository/SimulationRepository.java
rename to src/main/java/com/insilicosoft/portal/svc/simulation/persistence/repository/SimulationRepository.java
index ceb40a2..cea59c0 100644
--- a/src/main/java/com/insilicosoft/portal/svc/rip/persistence/repository/SimulationRepository.java
+++ b/src/main/java/com/insilicosoft/portal/svc/simulation/persistence/repository/SimulationRepository.java
@@ -1,8 +1,8 @@
-package com.insilicosoft.portal.svc.rip.persistence.repository;
+package com.insilicosoft.portal.svc.simulation.persistence.repository;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 
-import com.insilicosoft.portal.svc.rip.persistence.entity.Simulation;
+import com.insilicosoft.portal.svc.simulation.persistence.entity.Simulation;
 
 /**
  * Repository for {@link Simulation} objects.
diff --git a/src/main/java/com/insilicosoft/portal/svc/rip/persistence/repository/SubmissionRepository.java b/src/main/java/com/insilicosoft/portal/svc/simulation/persistence/repository/SubmissionRepository.java
similarity index 65%
rename from src/main/java/com/insilicosoft/portal/svc/rip/persistence/repository/SubmissionRepository.java
rename to src/main/java/com/insilicosoft/portal/svc/simulation/persistence/repository/SubmissionRepository.java
index 1bfab54..fc42941 100644
--- a/src/main/java/com/insilicosoft/portal/svc/rip/persistence/repository/SubmissionRepository.java
+++ b/src/main/java/com/insilicosoft/portal/svc/simulation/persistence/repository/SubmissionRepository.java
@@ -1,8 +1,8 @@
-package com.insilicosoft.portal.svc.rip.persistence.repository;
+package com.insilicosoft.portal.svc.simulation.persistence.repository;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 
-import com.insilicosoft.portal.svc.rip.persistence.entity.Submission;
+import com.insilicosoft.portal.svc.simulation.persistence.entity.Submission;
 
 /**
  * Simulation(s) submission request from user.
diff --git a/src/main/java/com/insilicosoft/portal/svc/rip/service/InputProcessorService.java b/src/main/java/com/insilicosoft/portal/svc/simulation/service/InputProcessorService.java
similarity index 78%
rename from src/main/java/com/insilicosoft/portal/svc/rip/service/InputProcessorService.java
rename to src/main/java/com/insilicosoft/portal/svc/simulation/service/InputProcessorService.java
index 7ba2120..eee3414 100644
--- a/src/main/java/com/insilicosoft/portal/svc/rip/service/InputProcessorService.java
+++ b/src/main/java/com/insilicosoft/portal/svc/simulation/service/InputProcessorService.java
@@ -1,8 +1,8 @@
-package com.insilicosoft.portal.svc.rip.service;
+package com.insilicosoft.portal.svc.simulation.service;
 
-import com.insilicosoft.portal.svc.rip.exception.FileProcessingException;
-import com.insilicosoft.portal.svc.rip.exception.InputVerificationException;
-import com.insilicosoft.portal.svc.rip.persistence.entity.Submission;
+import com.insilicosoft.portal.svc.simulation.exception.FileProcessingException;
+import com.insilicosoft.portal.svc.simulation.exception.InputVerificationException;
+import com.insilicosoft.portal.svc.simulation.persistence.entity.Submission;
 
 /**
  * Interface to input processing.
diff --git a/src/main/java/com/insilicosoft/portal/svc/rip/service/InputProcessorServiceImpl.java b/src/main/java/com/insilicosoft/portal/svc/simulation/service/InputProcessorServiceImpl.java
similarity index 90%
rename from src/main/java/com/insilicosoft/portal/svc/rip/service/InputProcessorServiceImpl.java
rename to src/main/java/com/insilicosoft/portal/svc/simulation/service/InputProcessorServiceImpl.java
index ce0b3ac..eee9ce6 100644
--- a/src/main/java/com/insilicosoft/portal/svc/rip/service/InputProcessorServiceImpl.java
+++ b/src/main/java/com/insilicosoft/portal/svc/simulation/service/InputProcessorServiceImpl.java
@@ -1,6 +1,6 @@
-package com.insilicosoft.portal.svc.rip.service;
+package com.insilicosoft.portal.svc.simulation.service;
 
-import static com.insilicosoft.portal.svc.rip.RipIdentifiers.BINDING_NAME_SIMULATION_INPUT;
+import static com.insilicosoft.portal.svc.simulation.SimulationIdentifiers.BINDING_NAME_SIMULATION_INPUT;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 import java.io.IOException;
@@ -20,13 +20,13 @@
 import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
-import com.insilicosoft.portal.svc.rip.event.SimulationMessage;
-import com.insilicosoft.portal.svc.rip.exception.FileProcessingException;
-import com.insilicosoft.portal.svc.rip.exception.InputVerificationException;
-import com.insilicosoft.portal.svc.rip.persistence.entity.Message;
-import com.insilicosoft.portal.svc.rip.persistence.entity.Simulation;
-import com.insilicosoft.portal.svc.rip.persistence.repository.SimulationRepository;
-import com.insilicosoft.portal.svc.rip.value.MessageLevel;
+import com.insilicosoft.portal.svc.simulation.event.SimulationMessage;
+import com.insilicosoft.portal.svc.simulation.exception.FileProcessingException;
+import com.insilicosoft.portal.svc.simulation.exception.InputVerificationException;
+import com.insilicosoft.portal.svc.simulation.persistence.entity.Message;
+import com.insilicosoft.portal.svc.simulation.persistence.entity.Simulation;
+import com.insilicosoft.portal.svc.simulation.persistence.repository.SimulationRepository;
+import com.insilicosoft.portal.svc.simulation.value.MessageLevel;
 
 enum FieldsSections {
   simulations
@@ -70,7 +70,7 @@ public InputProcessorServiceImpl(final SimulationRepository simulationRepository
 
   @Override
   public String get() {
-    return "All good from SubmissionController->InputProcessorService!!";
+    return "All good from SimulationController->InputProcessorService!!";
   }
 
   @Override
diff --git a/src/main/java/com/insilicosoft/portal/svc/rip/service/SubmissionService.java b/src/main/java/com/insilicosoft/portal/svc/simulation/service/SubmissionService.java
similarity index 79%
rename from src/main/java/com/insilicosoft/portal/svc/rip/service/SubmissionService.java
rename to src/main/java/com/insilicosoft/portal/svc/simulation/service/SubmissionService.java
index a60b078..a758051 100644
--- a/src/main/java/com/insilicosoft/portal/svc/rip/service/SubmissionService.java
+++ b/src/main/java/com/insilicosoft/portal/svc/simulation/service/SubmissionService.java
@@ -1,10 +1,10 @@
-package com.insilicosoft.portal.svc.rip.service;
+package com.insilicosoft.portal.svc.simulation.service;
 
 import java.util.Map;
 import java.util.Set;
 
-import com.insilicosoft.portal.svc.rip.persistence.entity.Message;
-import com.insilicosoft.portal.svc.rip.persistence.entity.Submission;
+import com.insilicosoft.portal.svc.simulation.persistence.entity.Message;
+import com.insilicosoft.portal.svc.simulation.persistence.entity.Submission;
 
 /**
  * User {@link Submission} service. 
diff --git a/src/main/java/com/insilicosoft/portal/svc/rip/service/SubmissionServiceImpl.java b/src/main/java/com/insilicosoft/portal/svc/simulation/service/SubmissionServiceImpl.java
similarity index 78%
rename from src/main/java/com/insilicosoft/portal/svc/rip/service/SubmissionServiceImpl.java
rename to src/main/java/com/insilicosoft/portal/svc/simulation/service/SubmissionServiceImpl.java
index ed1313e..eac207e 100644
--- a/src/main/java/com/insilicosoft/portal/svc/rip/service/SubmissionServiceImpl.java
+++ b/src/main/java/com/insilicosoft/portal/svc/simulation/service/SubmissionServiceImpl.java
@@ -1,13 +1,13 @@
-package com.insilicosoft.portal.svc.rip.service;
+package com.insilicosoft.portal.svc.simulation.service;
 
 import java.util.Map;
 import java.util.Set;
 
 import org.springframework.stereotype.Service;
 
-import com.insilicosoft.portal.svc.rip.persistence.entity.Message;
-import com.insilicosoft.portal.svc.rip.persistence.entity.Submission;
-import com.insilicosoft.portal.svc.rip.persistence.repository.SubmissionRepository;
+import com.insilicosoft.portal.svc.simulation.persistence.entity.Message;
+import com.insilicosoft.portal.svc.simulation.persistence.entity.Submission;
+import com.insilicosoft.portal.svc.simulation.persistence.repository.SubmissionRepository;
 
 /**
  * Submission service implementation.
diff --git a/src/main/java/com/insilicosoft/portal/svc/rip/service/advice/InputProcessorAdvice.java b/src/main/java/com/insilicosoft/portal/svc/simulation/service/advice/InputProcessorAdvice.java
similarity index 78%
rename from src/main/java/com/insilicosoft/portal/svc/rip/service/advice/InputProcessorAdvice.java
rename to src/main/java/com/insilicosoft/portal/svc/simulation/service/advice/InputProcessorAdvice.java
index c2a969e..c9e4ba9 100644
--- a/src/main/java/com/insilicosoft/portal/svc/rip/service/advice/InputProcessorAdvice.java
+++ b/src/main/java/com/insilicosoft/portal/svc/simulation/service/advice/InputProcessorAdvice.java
@@ -1,14 +1,14 @@
-package com.insilicosoft.portal.svc.rip.service.advice;
+package com.insilicosoft.portal.svc.simulation.service.advice;
 
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.AfterThrowing;
 import org.aspectj.lang.annotation.Aspect;
 import org.springframework.stereotype.Component;
 
-import com.insilicosoft.portal.svc.rip.exception.FileProcessingException;
-import com.insilicosoft.portal.svc.rip.persistence.entity.Message;
-import com.insilicosoft.portal.svc.rip.service.SubmissionService;
-import com.insilicosoft.portal.svc.rip.value.MessageLevel;
+import com.insilicosoft.portal.svc.simulation.exception.FileProcessingException;
+import com.insilicosoft.portal.svc.simulation.persistence.entity.Message;
+import com.insilicosoft.portal.svc.simulation.service.SubmissionService;
+import com.insilicosoft.portal.svc.simulation.value.MessageLevel;
 
 /**
  * Advice to handle some of the exceptions thrown from the input processing service.
@@ -36,7 +36,7 @@ public class InputProcessorAdvice {
    * @param fpe File processing exception caught.
    * @throws FileProcessingException Rethrow of original exception.
    */
-  @AfterThrowing(pointcut = "execution(* com.insilicosoft.portal.svc.rip.service.InputProcessorService.process(..))",
+  @AfterThrowing(pointcut = "execution(* com.insilicosoft.portal.svc.simulation.service.InputProcessorService.process(..))",
                  throwing = "fpe")
   public void handleFileProcessingException(JoinPoint joinPoint, FileProcessingException fpe)
                                             throws FileProcessingException {
diff --git a/src/main/java/com/insilicosoft/portal/svc/rip/value/MessageLevel.java b/src/main/java/com/insilicosoft/portal/svc/simulation/value/MessageLevel.java
similarity index 83%
rename from src/main/java/com/insilicosoft/portal/svc/rip/value/MessageLevel.java
rename to src/main/java/com/insilicosoft/portal/svc/simulation/value/MessageLevel.java
index 497d89c..606e0d7 100644
--- a/src/main/java/com/insilicosoft/portal/svc/rip/value/MessageLevel.java
+++ b/src/main/java/com/insilicosoft/portal/svc/simulation/value/MessageLevel.java
@@ -1,4 +1,4 @@
-package com.insilicosoft.portal.svc.rip.value;
+package com.insilicosoft.portal.svc.simulation.value;
 
 public enum MessageLevel {
 
diff --git a/src/test-e2e/java/com/insilicosoft/portal/svc/rip/RipSvcApplicationE2E.java b/src/test-e2e/java/com/insilicosoft/portal/svc/simulation/SimulationSvcApplicationE2E.java
similarity index 79%
rename from src/test-e2e/java/com/insilicosoft/portal/svc/rip/RipSvcApplicationE2E.java
rename to src/test-e2e/java/com/insilicosoft/portal/svc/simulation/SimulationSvcApplicationE2E.java
index e33cd53..9540923 100644
--- a/src/test-e2e/java/com/insilicosoft/portal/svc/rip/RipSvcApplicationE2E.java
+++ b/src/test-e2e/java/com/insilicosoft/portal/svc/simulation/SimulationSvcApplicationE2E.java
@@ -1,4 +1,4 @@
-package com.insilicosoft.portal.svc.rip;
+package com.insilicosoft.portal.svc.simulation;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -6,7 +6,7 @@
 import org.springframework.security.oauth2.jwt.JwtDecoder;
 
 @SpringBootTest
-class RipSvcApplicationE2E {
+class SimulationSvcApplicationE2E {
 
   @MockBean
   private JwtDecoder jwtDecoder;
diff --git a/src/test-e2e/java/com/insilicosoft/portal/svc/rip/actuator/ActuatorE2E.java b/src/test-e2e/java/com/insilicosoft/portal/svc/simulation/actuator/ActuatorE2E.java
similarity index 97%
rename from src/test-e2e/java/com/insilicosoft/portal/svc/rip/actuator/ActuatorE2E.java
rename to src/test-e2e/java/com/insilicosoft/portal/svc/simulation/actuator/ActuatorE2E.java
index 3e56bfa..b9cf6c5 100644
--- a/src/test-e2e/java/com/insilicosoft/portal/svc/rip/actuator/ActuatorE2E.java
+++ b/src/test-e2e/java/com/insilicosoft/portal/svc/simulation/actuator/ActuatorE2E.java
@@ -1,4 +1,4 @@
-package com.insilicosoft.portal.svc.rip.actuator;
+package com.insilicosoft.portal.svc.simulation.actuator;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/src/test-e2e/java/com/insilicosoft/portal/svc/rip/controller/SubmissionControllerE2E.java b/src/test-e2e/java/com/insilicosoft/portal/svc/simulation/controller/SimulationControllerE2E.java
similarity index 92%
rename from src/test-e2e/java/com/insilicosoft/portal/svc/rip/controller/SubmissionControllerE2E.java
rename to src/test-e2e/java/com/insilicosoft/portal/svc/simulation/controller/SimulationControllerE2E.java
index 2e0b606..ddd8f07 100644
--- a/src/test-e2e/java/com/insilicosoft/portal/svc/rip/controller/SubmissionControllerE2E.java
+++ b/src/test-e2e/java/com/insilicosoft/portal/svc/simulation/controller/SimulationControllerE2E.java
@@ -1,4 +1,4 @@
-package com.insilicosoft.portal.svc.rip.controller;
+package com.insilicosoft.portal.svc.simulation.controller;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
@@ -26,16 +26,16 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.insilicosoft.portal.svc.rip.RipIdentifiers;
+import com.insilicosoft.portal.svc.simulation.SimulationIdentifiers;
 
 import dasniko.testcontainers.keycloak.KeycloakContainer;
 
 @SpringBootTest(webEnvironment = RANDOM_PORT)
 @Testcontainers
-public class SubmissionControllerE2E {
+public class SimulationControllerE2E {
 
-  private static final String message = "No Multipart file! Did you supply the parameter '" + RipIdentifiers.PARAM_NAME_SIMULATION_FILE + "' in the POST request?";
-  private static final String postUrl = RipIdentifiers.REQUEST_MAPPING_SUBMISSION.concat(RipIdentifiers.REQUEST_MAPPING_SIMULATION);
+  private static final String message = "No Multipart file! Did you supply the parameter '" + SimulationIdentifiers.PARAM_NAME_SIMULATION_FILE + "' in the POST request?";
+  private static final String postUrl = SimulationIdentifiers.REQUEST_MAPPING_SIMULATION;
   private static final HttpHeaders httpHeaders = new HttpHeaders();
   private static final String goodRequestFileName = "request_good.json";
   private static final Path goodPath = Path.of("src",  "test", "resources", "requests", goodRequestFileName);
@@ -76,14 +76,14 @@ class GetMethods {
     @Test
     void success() {
       webTestClient.get()
-                   .uri(RipIdentifiers.REQUEST_MAPPING_SUBMISSION)
+                   .uri(SimulationIdentifiers.REQUEST_MAPPING_SIMULATION)
                    .headers(headers -> {
                      headers.setBearerAuth(bjornTokens.accessToken);
                    })
                    .exchange()
                    .expectStatus().isOk()
                    .expectBody(String.class).value(body -> {
-                     assertThat(body).isEqualTo("All good from SubmissionController->InputProcessorService!!");
+                     assertThat(body).isEqualTo("All good from SimulationController->InputProcessorService!!");
                    });
     }
   }
@@ -141,7 +141,7 @@ void failOnBadParamName() {
     @Test
     void success() {
       var multipartBodyBuilder = new MultipartBodyBuilder();
-      multipartBodyBuilder.part(RipIdentifiers.PARAM_NAME_SIMULATION_FILE,
+      multipartBodyBuilder.part(SimulationIdentifiers.PARAM_NAME_SIMULATION_FILE,
                                 new FileSystemResource(goodPath));
       webTestClient.post()
                    .uri(postUrl)
diff --git a/src/test-i/java/com/insilicosoft/portal/svc/rip/controller/SubmissionControllerIT.java b/src/test-i/java/com/insilicosoft/portal/svc/simulation/controller/SimulationControllerIT.java
similarity index 78%
rename from src/test-i/java/com/insilicosoft/portal/svc/rip/controller/SubmissionControllerIT.java
rename to src/test-i/java/com/insilicosoft/portal/svc/simulation/controller/SimulationControllerIT.java
index 11a9afa..9a93d88 100644
--- a/src/test-i/java/com/insilicosoft/portal/svc/rip/controller/SubmissionControllerIT.java
+++ b/src/test-i/java/com/insilicosoft/portal/svc/simulation/controller/SimulationControllerIT.java
@@ -1,4 +1,4 @@
-package com.insilicosoft.portal.svc.rip.controller;
+package com.insilicosoft.portal.svc.simulation.controller;
 
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -23,17 +23,17 @@
 import org.springframework.security.oauth2.jwt.JwtDecoder;
 import org.springframework.test.web.servlet.MockMvc;
 
-import com.insilicosoft.portal.svc.rip.RipIdentifiers;
-import com.insilicosoft.portal.svc.rip.config.SecurityConfig;
-import com.insilicosoft.portal.svc.rip.service.InputProcessorService;
-import com.insilicosoft.portal.svc.rip.service.SubmissionService;
+import com.insilicosoft.portal.svc.simulation.SimulationIdentifiers;
+import com.insilicosoft.portal.svc.simulation.config.SecurityConfig;
+import com.insilicosoft.portal.svc.simulation.service.InputProcessorService;
+import com.insilicosoft.portal.svc.simulation.service.SubmissionService;
 
-@WebMvcTest(SubmissionController.class)
+@WebMvcTest(SimulationController.class)
 @Import(SecurityConfig.class)
-public class SubmissionControllerIT {
+public class SimulationControllerIT {
 
   private static final MediaType textWithCharset = new MediaType(MediaType.TEXT_PLAIN, StandardCharsets.UTF_8);
-  private static final GrantedAuthority userRole = new SimpleGrantedAuthority("ROLE_".concat(RipIdentifiers.ROLE_USER));
+  private static final GrantedAuthority userRole = new SimpleGrantedAuthority("ROLE_".concat(SimulationIdentifiers.ROLE_USER));
 
   @Autowired
   private MockMvc mockMvc;
@@ -55,7 +55,7 @@ void testGet() throws Exception {
 
       when(mockInputProcessorService.get()).thenReturn(getMessage);
 
-      mockMvc.perform(get(RipIdentifiers.REQUEST_MAPPING_SUBMISSION).with(jwt().authorities(userRole)))
+      mockMvc.perform(get(SimulationIdentifiers.REQUEST_MAPPING_SIMULATION).with(jwt().authorities(userRole)))
              //.andDo(print())
              .andExpect(status().isOk())
              .andExpect(content().contentType(textWithCharset))
diff --git a/src/test-i/java/com/insilicosoft/portal/svc/rip/persistence/repository/SimulationRepositoryIT.java b/src/test-i/java/com/insilicosoft/portal/svc/simulation/persistence/repository/SimulationRepositoryIT.java
similarity index 93%
rename from src/test-i/java/com/insilicosoft/portal/svc/rip/persistence/repository/SimulationRepositoryIT.java
rename to src/test-i/java/com/insilicosoft/portal/svc/simulation/persistence/repository/SimulationRepositoryIT.java
index 86bf83d..6945bc4 100644
--- a/src/test-i/java/com/insilicosoft/portal/svc/rip/persistence/repository/SimulationRepositoryIT.java
+++ b/src/test-i/java/com/insilicosoft/portal/svc/simulation/persistence/repository/SimulationRepositoryIT.java
@@ -1,4 +1,4 @@
-package com.insilicosoft.portal.svc.rip.persistence.repository;
+package com.insilicosoft.portal.svc.simulation.persistence.repository;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase.Replace.NONE;
@@ -17,7 +17,7 @@
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
-import com.insilicosoft.portal.svc.rip.persistence.entity.Simulation;
+import com.insilicosoft.portal.svc.simulation.persistence.entity.Simulation;
 
 // TODO: Test passes, but HikariPool generating PSQLException/ConnectException 
 
diff --git a/src/test/java/com/insilicosoft/portal/svc/rip/controller/SubmissionControllerTest.java b/src/test/java/com/insilicosoft/portal/svc/simulation/controller/SimulationControllerTest.java
similarity index 80%
rename from src/test/java/com/insilicosoft/portal/svc/rip/controller/SubmissionControllerTest.java
rename to src/test/java/com/insilicosoft/portal/svc/simulation/controller/SimulationControllerTest.java
index 7914984..6a8ce6c 100644
--- a/src/test/java/com/insilicosoft/portal/svc/rip/controller/SubmissionControllerTest.java
+++ b/src/test/java/com/insilicosoft/portal/svc/simulation/controller/SimulationControllerTest.java
@@ -1,4 +1,4 @@
-package com.insilicosoft.portal.svc.rip.controller;
+package com.insilicosoft.portal.svc.simulation.controller;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -21,18 +21,18 @@
 import org.springframework.http.MediaType;
 import org.springframework.mock.web.MockMultipartFile;
 
-import com.insilicosoft.portal.svc.rip.RipIdentifiers;
-import com.insilicosoft.portal.svc.rip.exception.FileProcessingException;
-import com.insilicosoft.portal.svc.rip.exception.InputVerificationException;
-import com.insilicosoft.portal.svc.rip.service.InputProcessorService;
-import com.insilicosoft.portal.svc.rip.service.SubmissionService;
+import com.insilicosoft.portal.svc.simulation.SimulationIdentifiers;
+import com.insilicosoft.portal.svc.simulation.exception.FileProcessingException;
+import com.insilicosoft.portal.svc.simulation.exception.InputVerificationException;
+import com.insilicosoft.portal.svc.simulation.service.InputProcessorService;
+import com.insilicosoft.portal.svc.simulation.service.SubmissionService;
 
 @ExtendWith(MockitoExtension.class)
-public class SubmissionControllerTest {
+public class SimulationControllerTest {
 
-  private static final String message = "No Multipart file! Did you supply the parameter '" + RipIdentifiers.PARAM_NAME_SIMULATION_FILE + "' in the POST request?";
+  private static final String message = "No Multipart file! Did you supply the parameter '" + SimulationIdentifiers.PARAM_NAME_SIMULATION_FILE + "' in the POST request?";
 
-  private SubmissionController controller;
+  private SimulationController controller;
 
   @Captor
   private ArgumentCaptor<byte[]> captorBytes;
@@ -46,7 +46,7 @@ public class SubmissionControllerTest {
 
   @BeforeEach
   void setUp() {
-    controller = new SubmissionController(mockInputProcessorService, mockSubmissionService);
+    controller = new SimulationController(mockInputProcessorService, mockSubmissionService);
   }
 
   @DisplayName("Test GET method(s)")
diff --git a/src/test/java/com/insilicosoft/portal/svc/rip/exception/FileProcessingExceptionTest.java b/src/test/java/com/insilicosoft/portal/svc/simulation/exception/FileProcessingExceptionTest.java
similarity index 88%
rename from src/test/java/com/insilicosoft/portal/svc/rip/exception/FileProcessingExceptionTest.java
rename to src/test/java/com/insilicosoft/portal/svc/simulation/exception/FileProcessingExceptionTest.java
index 2f6c7ab..fd86cda 100644
--- a/src/test/java/com/insilicosoft/portal/svc/rip/exception/FileProcessingExceptionTest.java
+++ b/src/test/java/com/insilicosoft/portal/svc/simulation/exception/FileProcessingExceptionTest.java
@@ -1,4 +1,4 @@
-package com.insilicosoft.portal.svc.rip.exception;
+package com.insilicosoft.portal.svc.simulation.exception;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
diff --git a/src/test/java/com/insilicosoft/portal/svc/rip/persistence/entity/SimulationTest.java b/src/test/java/com/insilicosoft/portal/svc/simulation/persistence/entity/SimulationTest.java
similarity index 80%
rename from src/test/java/com/insilicosoft/portal/svc/rip/persistence/entity/SimulationTest.java
rename to src/test/java/com/insilicosoft/portal/svc/simulation/persistence/entity/SimulationTest.java
index 8a47d3b..e12b1c0 100644
--- a/src/test/java/com/insilicosoft/portal/svc/rip/persistence/entity/SimulationTest.java
+++ b/src/test/java/com/insilicosoft/portal/svc/simulation/persistence/entity/SimulationTest.java
@@ -1,4 +1,4 @@
-package com.insilicosoft.portal.svc.rip.persistence.entity;
+package com.insilicosoft.portal.svc.simulation.persistence.entity;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -8,7 +8,7 @@
 
 import org.junit.jupiter.api.Test;
 
-import com.insilicosoft.portal.svc.rip.value.MessageLevel;
+import com.insilicosoft.portal.svc.simulation.value.MessageLevel;
 
 public class SimulationTest {
 
diff --git a/src/test/java/com/insilicosoft/portal/svc/rip/service/InputProcessorServiceTest.java b/src/test/java/com/insilicosoft/portal/svc/simulation/service/InputProcessorServiceTest.java
similarity index 88%
rename from src/test/java/com/insilicosoft/portal/svc/rip/service/InputProcessorServiceTest.java
rename to src/test/java/com/insilicosoft/portal/svc/simulation/service/InputProcessorServiceTest.java
index 5d5d81b..db9c7d1 100644
--- a/src/test/java/com/insilicosoft/portal/svc/rip/service/InputProcessorServiceTest.java
+++ b/src/test/java/com/insilicosoft/portal/svc/simulation/service/InputProcessorServiceTest.java
@@ -1,4 +1,4 @@
-package com.insilicosoft.portal.svc.rip.service;
+package com.insilicosoft.portal.svc.simulation.service;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -11,9 +11,9 @@
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.cloud.stream.function.StreamBridge;
 
-import com.insilicosoft.portal.svc.rip.exception.FileProcessingException;
-import com.insilicosoft.portal.svc.rip.persistence.entity.Simulation;
-import com.insilicosoft.portal.svc.rip.persistence.repository.SimulationRepository;
+import com.insilicosoft.portal.svc.simulation.exception.FileProcessingException;
+import com.insilicosoft.portal.svc.simulation.persistence.entity.Simulation;
+import com.insilicosoft.portal.svc.simulation.persistence.repository.SimulationRepository;
 
 @ExtendWith(MockitoExtension.class)
 public class InputProcessorServiceTest {