diff --git a/docker/release/dockerfiles/opensearch.al2.dockerfile b/docker/release/dockerfiles/opensearch.al2.dockerfile
index 5bfac85f23..28253f31cd 100644
--- a/docker/release/dockerfiles/opensearch.al2.dockerfile
+++ b/docker/release/dockerfiles/opensearch.al2.dockerfile
@@ -39,7 +39,7 @@ RUN ls -l $TEMP_DIR && \
     tar -xzpf /tmp/opensearch/opensearch-`uname -p`.tgz -C $OPENSEARCH_HOME --strip-components=1 && \
     mkdir -p $OPENSEARCH_HOME/data && chown -Rv $UID:$GID $OPENSEARCH_HOME/data && \
     if [[ -d $SECURITY_PLUGIN_DIR ]] ; then chmod -v 750 $SECURITY_PLUGIN_DIR/tools/* ; fi && \
-    if [[ -d $PERFORMANCE_ANALYZER_PLUGIN_DIR ]] ; then cp -v $TEMP_DIR/performance-analyzer.properties $PERFORMANCE_ANALYZER_PLUGIN_DIR/pa_config/; fi && \
+    if [[ -d $PERFORMANCE_ANALYZER_PLUGIN_DIR ]] ; then cp -v $TEMP_DIR/performance-analyzer.properties $PERFORMANCE_ANALYZER_PLUGIN_DIR/config/; fi && \
     cp -v $TEMP_DIR/opensearch-docker-entrypoint.sh $TEMP_DIR/opensearch-onetime-setup.sh $OPENSEARCH_HOME/ && \
     cp -v $TEMP_DIR/log4j2.properties $TEMP_DIR/opensearch.yml $OPENSEARCH_HOME/config/ && \
     ls -l $OPENSEARCH_HOME && \
diff --git a/scripts/deploy_single_tar_cluster.sh b/scripts/deploy_single_tar_cluster.sh
index 76a51a9c2d..3675be6634 100755
--- a/scripts/deploy_single_tar_cluster.sh
+++ b/scripts/deploy_single_tar_cluster.sh
@@ -119,7 +119,7 @@ echo "script.context.field.max_compilations_rate: 1000/1m" >> config/opensearch.
 # Required for Security
 echo "plugins.security.unsupported.restapi.allow_securityconfig_modification: true" >> config/opensearch.yml
 # Required for PA
-echo "webservice-bind-host = 0.0.0.0" >> plugins/opensearch-performance-analyzer/pa_config/performance-analyzer.properties
+echo "webservice-bind-host = 0.0.0.0" >> plugins/opensearch-performance-analyzer/config/performance-analyzer.properties
 # Security setup
 if [ "$ENABLE_SECURITY" == "false" ]
 then
diff --git a/scripts/legacy/tar/linux/opensearch-tar-install.sh b/scripts/legacy/tar/linux/opensearch-tar-install.sh
index a1f19eb812..1d84199ce6 100755
--- a/scripts/legacy/tar/linux/opensearch-tar-install.sh
+++ b/scripts/legacy/tar/linux/opensearch-tar-install.sh
@@ -9,10 +9,10 @@ KNN_LIB_DIR=$OPENSEARCH_HOME/plugins/opensearch-knn/lib
 bash $OPENSEARCH_HOME/plugins/opensearch-security/tools/install_demo_configuration.sh -y -i -s
 
 ##Perf Plugin
-chmod 755 $OPENSEARCH_HOME/plugins/opensearch-performance-analyzer/pa_bin/performance-analyzer-agent
+chmod 755 $OPENSEARCH_HOME/plugins/opensearch-performance-analyzer/bin/performance-analyzer-agent
 chmod 755 $OPENSEARCH_HOME/bin/performance-analyzer-agent-cli
 echo "done security"
-PA_AGENT_JAVA_OPTS="-Dlog4j.configurationFile=$OPENSEARCH_HOME/plugins/opensearch-performance-analyzer/pa_config/log4j2.xml \
+PA_AGENT_JAVA_OPTS="-Dlog4j.configurationFile=$OPENSEARCH_HOME/plugins/opensearch-performance-analyzer/config/log4j2.xml \
               -Xms64M -Xmx64M -XX:+UseSerialGC -XX:CICompilerCount=1 -XX:-TieredCompilation -XX:InitialCodeCacheSize=4096 \
               -XX:MaxRAM=400m"
 
@@ -26,7 +26,7 @@ if ! grep -q '## OpenSearch Performance Analyzer' $OPENSEARCH_HOME/config/jvm.op
    echo '## OpenSearch Performance Analyzer' >> $OPENSEARCH_HOME/config/jvm.options
    echo "-Dclk.tck=$CLK_TCK" >> $OPENSEARCH_HOME/config/jvm.options
    echo "-Djdk.attach.allowAttachSelf=true" >> $OPENSEARCH_HOME/config/jvm.options
-   echo "-Djava.security.policy=$OPENSEARCH_HOME/plugins/opensearch-performance-analyzer/pa_config/opensearch_security.policy" >> $OPENSEARCH_HOME/config/jvm.options
+   echo "-Djava.security.policy=$OPENSEARCH_HOME/plugins/opensearch-performance-analyzer/config/opensearch_security.policy" >> $OPENSEARCH_HOME/config/jvm.options
    echo "--add-opens=jdk.attach/sun.tools.attach=ALL-UNNAMED" >> $OPENSEARCH_HOME/config/jvm.options
 fi
 echo "done plugins"
diff --git a/scripts/opensearch-onetime-setup.sh b/scripts/opensearch-onetime-setup.sh
index c275c851eb..53a4035736 100755
--- a/scripts/opensearch-onetime-setup.sh
+++ b/scripts/opensearch-onetime-setup.sh
@@ -35,7 +35,7 @@ fi
 PA_PLUGIN="opensearch-performance-analyzer"
 
 if [ -d $OPENSEARCH_HOME/plugins/$PA_PLUGIN ]; then
-    chmod 755 $OPENSEARCH_HOME/plugins/$PA_PLUGIN/pa_bin/performance-analyzer-agent
+    chmod 755 $OPENSEARCH_HOME/plugins/$PA_PLUGIN/bin/performance-analyzer-agent
     chmod 755 $OPENSEARCH_HOME/bin/performance-analyzer-agent-cli
 fi
 
@@ -45,7 +45,7 @@ if ! grep -q '## OpenDistro Performance Analyzer' $OPENSEARCH_HOME/config/jvm.op
    echo '## OpenDistro Performance Analyzer' >> $OPENSEARCH_HOME/config/jvm.options
    echo "-Dclk.tck=$CLK_TCK" >> $OPENSEARCH_HOME/config/jvm.options
    echo "-Djdk.attach.allowAttachSelf=true" >> $OPENSEARCH_HOME/config/jvm.options
-   echo "-Djava.security.policy=$OPENSEARCH_HOME/plugins/$PA_PLUGIN/pa_config/opensearch_security.policy" >> $OPENSEARCH_HOME/config/jvm.options
+   echo "-Djava.security.policy=$OPENSEARCH_HOME/plugins/$PA_PLUGIN/config/opensearch_security.policy" >> $OPENSEARCH_HOME/config/jvm.options
    echo "--add-opens=jdk.attach/sun.tools.attach=ALL-UNNAMED" >> $OPENSEARCH_HOME/config/jvm.options
 fi
 
diff --git a/scripts/pkg/build_templates/opensearch/opensearch.rpm.spec b/scripts/pkg/build_templates/opensearch/opensearch.rpm.spec
index d09e5f0bc7..6ddbde954d 100644
--- a/scripts/pkg/build_templates/opensearch/opensearch.rpm.spec
+++ b/scripts/pkg/build_templates/opensearch/opensearch.rpm.spec
@@ -93,7 +93,7 @@ if ! grep -q '## OpenSearch Performance Analyzer' %{config_dir}/jvm.options; the
    echo '## OpenSearch Performance Analyzer' >> %{config_dir}/jvm.options
    echo "-Dclk.tck=$CLK_TCK" >> %{config_dir}/jvm.options
    echo "-Djdk.attach.allowAttachSelf=true" >> %{config_dir}/jvm.options
-   echo "-Djava.security.policy=file:///usr/share/opensearch/plugins/opensearch-performance-analyzer/pa_config/opensearch_security.policy" >> %{config_dir}/jvm.options
+   echo "-Djava.security.policy=file:///usr/share/opensearch/plugins/opensearch-performance-analyzer/config/opensearch_security.policy" >> %{config_dir}/jvm.options
    echo "--add-opens=jdk.attach/sun.tools.attach=ALL-UNNAMED" >> %{config_dir}/jvm.options
 fi
 # Reload systemctl daemon