diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
-### Docker images for Jenkins slaves
+### Docker images for Jenkins agents
 
-This repository offers Dockerfile to build images to run Jenkins slaves
+This repository offers Dockerfile to build images to run Jenkins agents
 for CI and CD purposes.
 
-#### nasqueron/jenkins-slave-barebone
+#### nasqueron/jenkins-agent-barebone
 
 This image contains only what's required by Jenkins:
 
@@ -11,7 +11,7 @@
 * Java
 * ant
 
-#### nasqueron/jenkins-slave-php
+#### nasqueron/jenkins-agent-php
 
 This image contains:
 
@@ -37,7 +37,7 @@
 * Code review:
   * Arcanist
 
-#### nasqueron/jenkins-slave-node
+#### nasqueron/jenkins-agent-node
 
 This image contains:
 
diff --git a/jenkins-slave-barebone/Dockerfile b/jenkins-agent-barebone/Dockerfile
rename from jenkins-slave-barebone/Dockerfile
rename to jenkins-agent-barebone/Dockerfile
--- a/jenkins-slave-barebone/Dockerfile
+++ b/jenkins-agent-barebone/Dockerfile
@@ -1,5 +1,5 @@
 #
-# Nasqueron - Jenkins slave Docker image, not customized
+# Nasqueron - Jenkins agent Docker image, not customized
 #
 
 FROM debian:stretch
diff --git a/jenkins-slave-node/Dockerfile b/jenkins-agent-node/Dockerfile
rename from jenkins-slave-node/Dockerfile
rename to jenkins-agent-node/Dockerfile
--- a/jenkins-slave-node/Dockerfile
+++ b/jenkins-agent-node/Dockerfile
@@ -1,8 +1,8 @@
 #
-# Nasqueron - Jenkins slave Docker image for Node applications
+# Nasqueron - Jenkins agent Docker image for Node applications
 #
 
-FROM nasqueron/jenkins-slave-barebone
+FROM nasqueron/jenkins-agent-barebone
 MAINTAINER Sébastien Santoro aka Dereckson <dereckson+nasqueron-docker@espace-win.org>
 
 #
diff --git a/jenkins-slave-php/Dockerfile b/jenkins-agent-php/Dockerfile
rename from jenkins-slave-php/Dockerfile
rename to jenkins-agent-php/Dockerfile
--- a/jenkins-slave-php/Dockerfile
+++ b/jenkins-agent-php/Dockerfile
@@ -1,5 +1,5 @@
 #
-# Nasqueron - Jenkins slave Docker image for PHP applications
+# Nasqueron - Jenkins agent Docker image for PHP applications
 #
 
 FROM nasqueron/php-cli
diff --git a/jenkins-slave-php/files/usr/local/etc/php/conf.d/ast.ini b/jenkins-agent-php/files/usr/local/etc/php/conf.d/ast.ini
rename from jenkins-slave-php/files/usr/local/etc/php/conf.d/ast.ini
rename to jenkins-agent-php/files/usr/local/etc/php/conf.d/ast.ini
diff --git a/jenkins-slave-php/files/usr/local/etc/php/conf.d/xdebug.ini b/jenkins-agent-php/files/usr/local/etc/php/conf.d/xdebug.ini
rename from jenkins-slave-php/files/usr/local/etc/php/conf.d/xdebug.ini
rename to jenkins-agent-php/files/usr/local/etc/php/conf.d/xdebug.ini
diff --git a/jenkins-slave-rust/Dockerfile b/jenkins-agent-rust/Dockerfile
rename from jenkins-slave-rust/Dockerfile
rename to jenkins-agent-rust/Dockerfile
--- a/jenkins-slave-rust/Dockerfile
+++ b/jenkins-agent-rust/Dockerfile
@@ -1,8 +1,8 @@
 #
-# Nasqueron - Jenkins slave Docker image for Rust applications
+# Nasqueron - Jenkins agent Docker image for Rust applications
 #
 
-FROM nasqueron/jenkins-slave-barebone
+FROM nasqueron/jenkins-agent-barebone
 MAINTAINER Sébastien Santoro aka Dereckson <dereckson+nasqueron-docker@espace-win.org>
 
 #