diff --git a/bitnami/blackbox-exporter/0/Dockerfile b/bitnami/blackbox-exporter/0/Dockerfile
index 479975445e33..afeb543b16b0 100644
--- a/bitnami/blackbox-exporter/0/Dockerfile
+++ b/bitnami/blackbox-exporter/0/Dockerfile
@@ -1,23 +1,23 @@
 FROM bitnami/minideb:jessie as buildenv
 
 RUN install_packages ca-certificates wget
-RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stacksmith/blackbox_exporter-0.12.0-0-linux-x64-debian-8.tar.gz && \
-    echo "0b253d443d8d5ec09111dbb42fe7b0077b7f7066157ad16c7d68abbb5c7e7ef6  /tmp/bitnami/pkg/cache/blackbox_exporter-0.12.0-0-linux-x64-debian-8.tar.gz" | sha256sum -c - && \
-    tar -zxf /tmp/bitnami/pkg/cache/blackbox_exporter-0.12.0-0-linux-x64-debian-8.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \
-    rm -rf /tmp/bitnami/pkg/cache/blackbox_exporter-0.12.0-0-linux-x64-debian-8.tar.gz
+RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stacksmith/blackbox-exporter-0.12.0-1-linux-x64-debian-8.tar.gz && \
+    echo "5d24ccec9286b12c46043e15728a895cd96841781f86e07b6e54f675398c7e88  /tmp/bitnami/pkg/cache/blackbox-exporter-0.12.0-1-linux-x64-debian-8.tar.gz" | sha256sum -c - && \
+    tar -zxf /tmp/bitnami/pkg/cache/blackbox-exporter-0.12.0-1-linux-x64-debian-8.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \
+    rm -rf /tmp/bitnami/pkg/cache/blackbox-exporter-0.12.0-1-linux-x64-debian-8.tar.gz
 
 ##################
 
 FROM bitnami/minideb:jessie
 LABEL maintainer "Bitnami <containers@bitnami.com>"
 
-COPY --from=buildenv /opt/bitnami/blackbox_exporter /opt/bitnami/blackbox_exporter
-ENV BITNAMI_APP_NAME="blackbox_exporter" \
-    BITNAMI_IMAGE_VERSION="0.12.0-r25" \
-    PATH="/opt/bitnami/blackbox_exporter/bin:$PATH"
+COPY --from=buildenv /opt/bitnami/blackbox-exporter /opt/bitnami/blackbox-exporter
+ENV BITNAMI_APP_NAME="blackbox-exporter" \
+    BITNAMI_IMAGE_VERSION="0.12.0-r26" \
+    PATH="/opt/bitnami/blackbox-exporter/bin:$PATH"
 
 EXPOSE 9115
 
-WORKDIR /opt/bitnami/blackbox_exporter
+WORKDIR /opt/bitnami/blackbox-exporter
 USER 1001
-ENTRYPOINT ["/opt/bitnami/blackbox_exporter/bin/blackbox_exporter"]
+ENTRYPOINT ["/opt/bitnami/blackbox-exporter/bin/blackbox_exporter"]
diff --git a/bitnami/blackbox-exporter/0/docker-compose.yml b/bitnami/blackbox-exporter/0/docker-compose.yml
index f0116d2a6fc6..9aafce89ab91 100644
--- a/bitnami/blackbox-exporter/0/docker-compose.yml
+++ b/bitnami/blackbox-exporter/0/docker-compose.yml
@@ -1,5 +1,5 @@
 version: '2'
 
 services:
-  blackbox_exporter:
-    image: bitnami/blackbox_exporter:0
+  blackbox-exporter:
+    image: bitnami/blackbox-exporter:0
diff --git a/bitnami/blackbox-exporter/README.md b/bitnami/blackbox-exporter/README.md
index 2accbf6def74..c8c1f0b2101f 100644
--- a/bitnami/blackbox-exporter/README.md
+++ b/bitnami/blackbox-exporter/README.md
@@ -1,15 +1,15 @@
-[![CircleCI](https://circleci.com/gh/bitnami/bitnami-docker-blackbox_exporter/tree/master.svg?style=shield)](https://circleci.com/gh/bitnami/bitnami-docker-blackbox_exporter/tree/master)
+[![CircleCI](https://circleci.com/gh/bitnami/bitnami-docker-blackbox-exporter/tree/master.svg?style=shield)](https://circleci.com/gh/bitnami/bitnami-docker-blackbox-exporter/tree/master)
 
-# What is Blackbox_exporter?
+# What is Blackbox Exporter?
 
 The blackbox exporter allows blackbox probing of endpoints over HTTP, HTTPS, DNS, TCP and ICMP.
 
-[https://github.com/prometheus/blackbox_exporter](https://github.com/prometheus/blackbox_exporter)
+[https://github.com/prometheus/blackbox-exporter](https://github.com/prometheus/blackbox-exporter)
 
 # TL;DR;
 
 ```bash
-$ docker run --name blackbox_exporter bitnami/blackbox_exporter:latest
+$ docker run --name blackbox-exporter bitnami/blackbox-exporter:latest
 ```
 
 # Why use Bitnami Images?
@@ -22,22 +22,22 @@ $ docker run --name blackbox_exporter bitnami/blackbox_exporter:latest
 
 # Get this image
 
-The recommended way to get the Bitnami Blackbox_exporter Docker Image is to pull the prebuilt image from the [Docker Hub Registry](https://hub.docker.com/r/bitnami/blackbox_exporter).
+The recommended way to get the Bitnami Blackbox Exporter Docker Image is to pull the prebuilt image from the [Docker Hub Registry](https://hub.docker.com/r/bitnami/blackbox-exporter).
 
 ```bash
-$ docker pull bitnami/blackbox_exporter:latest
+$ docker pull bitnami/blackbox-exporter:latest
 ```
 
-To use a specific version, you can pull a versioned tag. You can view the [list of available versions](https://hub.docker.com/r/bitnami/blackbox_exporter/tags/) in the Docker Hub Registry.
+To use a specific version, you can pull a versioned tag. You can view the [list of available versions](https://hub.docker.com/r/bitnami/blackbox-exporter/tags/) in the Docker Hub Registry.
 
 ```bash
-$ docker pull bitnami/blackbox_exporter:[TAG]
+$ docker pull bitnami/blackbox-exporter:[TAG]
 ```
 
 If you wish, you can also build the image yourself.
 
 ```bash
-$ docker build -t bitnami/blackbox_exporter:latest https://github.com/bitnami/bitnami-docker-blackbox_exporter.git
+$ docker build -t bitnami/blackbox-exporter:latest https://github.com/bitnami/bitnami-docker-blackbox-exporter.git
 ```
 
 # Connecting to other containers
@@ -51,15 +51,15 @@ Containers attached to the same network can communicate with each other using th
 ### Step 1: Create a network
 
 ```bash
-$ docker network create blackbox_exporter-network --driver bridge
+$ docker network create blackbox-exporter-network --driver bridge
 ```
 
 ### Step 2: Launch the Blacbox_exporter container within your network
 
-Use the `--network <NETWORK>` argument to the `docker run` command to attach the container to the `blackbox_exporter-network` network.
+Use the `--network <NETWORK>` argument to the `docker run` command to attach the container to the `blackbox-exporter-network` network.
 
 ```bash
-$ docker run --name blackbox_exporter-node1 --network blackbox_exporter-network bitnami/blackbox_exporter:latest
+$ docker run --name blackbox-exporter-node1 --network blackbox-exporter-network bitnami/blackbox-exporter:latest
 ```
 
 ### Step 3: Run another containers
@@ -71,7 +71,7 @@ We can launch another containers using the same flag (`--network NETWORK`) in th
 
 Blackbox exporter is configured via a configuration file and command-line flags (such as what configuration file to load, what port to listen on, and the logging format and level).
 
-The default location for the config file is `/opt/bitnami/blackbox_exporter/conf/config.yml`, you can mount a volume there in order to overwrite it.
+The default location for the config file is `/opt/bitnami/blackbox-exporter/conf/config.yml`, you can mount a volume there in order to overwrite it.
 
 The file is written in YAML format, defined by the scheme described below. Brackets indicate that a parameter is optional. For non-list parameters the value is set to the specified default.
 
@@ -108,14 +108,14 @@ scrape_configs:
         replacement: 127.0.0.1:9115  # The blackbox exporter's real hostname:port.
 ```
 
-[Further information](https://github.com/prometheus/blackbox_exporter/blob/master/CONFIGURATION.md)
+[Further information](https://github.com/prometheus/blackbox-exporter/blob/master/CONFIGURATION.md)
 
 # Logging
 
-The Bitnami blackbox_exporter Docker image sends the container logs to the `stdout`. To view the logs:
+The Bitnami blackbox-exporter Docker image sends the container logs to the `stdout`. To view the logs:
 
 ```bash
-$ docker logs blackbox_exporter
+$ docker logs blackbox-exporter
 ```
 
 You can configure the containers [logging driver](https://docs.docker.com/engine/admin/logging/overview/) using the `--log-driver` option if you wish to consume the container logs differently. In the default configuration docker uses the `json-file` driver.
@@ -124,12 +124,12 @@ You can configure the containers [logging driver](https://docs.docker.com/engine
 
 ## Upgrade this image
 
-Bitnami provides up-to-date versions of blackbox_exporter, including security patches, soon after they are made upstream. We recommend that you follow these steps to upgrade your container.
+Bitnami provides up-to-date versions of blackbox-exporter, including security patches, soon after they are made upstream. We recommend that you follow these steps to upgrade your container.
 
 ### Step 1: Get the updated image
 
 ```bash
-$ docker pull bitnami/blackbox_exporter:latest
+$ docker pull bitnami/blackbox-exporter:latest
 ```
 
 ### Step 2: Stop and backup the currently running container
@@ -137,13 +137,13 @@ $ docker pull bitnami/blackbox_exporter:latest
 Stop the currently running container using the command
 
 ```bash
-$ docker stop blackbox_exporter
+$ docker stop blackbox-exporter
 ```
 
-Next, take a snapshot of the persistent volume `/path/to/blackbox_exporter-persistence` using:
+Next, take a snapshot of the persistent volume `/path/to/blackbox-exporter-persistence` using:
 
 ```bash
-$ rsync -a /path/to/blackbox_exporter-persistence /path/to/blackbox_exporter-persistence.bkp.$(date +%Y%m%d-%H.%M.%S)
+$ rsync -a /path/to/blackbox-exporter-persistence /path/to/blackbox-exporter-persistence.bkp.$(date +%Y%m%d-%H.%M.%S)
 ```
 
 You can use this snapshot to restore the database state should the upgrade fail.
@@ -151,7 +151,7 @@ You can use this snapshot to restore the database state should the upgrade fail.
 ### Step 3: Remove the currently running container
 
 ```bash
-$ docker rm -v blackbox_exporter
+$ docker rm -v blackbox-exporter
 ```
 
 ### Step 4: Run the new image
@@ -159,16 +159,16 @@ $ docker rm -v blackbox_exporter
 Re-create your container from the new image, [restoring your backup](#restoring-a-backup) if necessary.
 
 ```bash
-$ docker run --name blackbox_exporter bitnami/blackbox_exporter:latest
+$ docker run --name blackbox-exporter bitnami/blackbox-exporter:latest
 ```
 
 # Contributing
 
-We'd love for you to contribute to this container. You can request new features by creating an [issue](https://github.com/bitnami/bitnami-docker-blackbox_exporter/issues), or submit a [pull request](https://github.com/bitnami/bitnami-docker-blackbox_exporter/pulls) with your contribution.
+We'd love for you to contribute to this container. You can request new features by creating an [issue](https://github.com/bitnami/bitnami-docker-blackbox-exporter/issues), or submit a [pull request](https://github.com/bitnami/bitnami-docker-blackbox-exporter/pulls) with your contribution.
 
 # Issues
 
-If you encountered a problem running this container, you can file an [issue](https://github.com/bitnami/bitnami-docker-blackbox_exporter/issues). For us to provide better support, be sure to include the following information in your issue:
+If you encountered a problem running this container, you can file an [issue](https://github.com/bitnami/bitnami-docker-blackbox-exporter/issues). For us to provide better support, be sure to include the following information in your issue:
 
 - Host OS and version
 - Docker version (`docker version`)
diff --git a/bitnami/blackbox-exporter/circle.yml b/bitnami/blackbox-exporter/circle.yml
index 973266057e71..2fac39cf4c33 100644
--- a/bitnami/blackbox-exporter/circle.yml
+++ b/bitnami/blackbox-exporter/circle.yml
@@ -7,7 +7,7 @@ jobs:
         environment:
           RELEASE_SERIES_LIST: "0"
           LATEST_STABLE: "0"
-          IMAGE_NAME: blackbox_exporter
+          IMAGE_NAME: blackbox-exporter
           DOCKER_PROJECT: bitnami
           QUAY_PROJECT: bitnami
           GCLOUD_PROJECT: bitnami-containers