diff --git a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/Releaser.java b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/Releaser.java
index df2c27bf..63496916 100644
--- a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/Releaser.java
+++ b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/Releaser.java
@@ -20,7 +20,7 @@ import org.springframework.util.Assert;
  * @author Marcin Grzejszczak
  */
 public class Releaser {
-	private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+	private static final Logger log = LoggerFactory.getLogger(Releaser.class);
 
 	private static boolean ASSERT_SNAPSHOTS = true;
 	private static boolean SKIP_SNAPSHOT_ASSERTION = false;
diff --git a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/git/GitRepo.java b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/git/GitRepo.java
index 1c6eca82..8c4daf2f 100644
--- a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/git/GitRepo.java
+++ b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/git/GitRepo.java
@@ -66,7 +66,7 @@ import com.jcraft.jsch.agentproxy.usocket.JNAUSocketFactory;
  */
 class GitRepo {
 
-	private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+	private static final Logger log = LoggerFactory.getLogger(GitRepo.class);
 
 	private final GitRepo.JGitFactory gitFactory;
 
@@ -333,7 +333,7 @@ class GitRepo {
 	 * {@link org.eclipse.jgit.api.CloneCommand} allowing for easier unit testing.
 	 */
 	static class JGitFactory {
-		private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+		private static final Logger log = LoggerFactory.getLogger(JGitFactory.class);
 
 		private final JschConfigSessionFactory factory = new JschConfigSessionFactory() {
 
diff --git a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/git/GithubIssues.java b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/git/GithubIssues.java
index d15e7e47..4759e117 100644
--- a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/git/GithubIssues.java
+++ b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/git/GithubIssues.java
@@ -27,7 +27,7 @@ import org.springframework.util.StringUtils;
  */
 class GithubIssues {
 
-	private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+	private static final Logger log = LoggerFactory.getLogger(GithubIssues.class);
 	private static final String GITHUB_ISSUE_TITLE = "Spring Cloud Release took place";
 
 	private final Github github;
diff --git a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/git/GithubMilestones.java b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/git/GithubMilestones.java
index 43621546..1db5c8cd 100644
--- a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/git/GithubMilestones.java
+++ b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/git/GithubMilestones.java
@@ -24,7 +24,7 @@ import org.springframework.util.Assert;
  */
 class GithubMilestones {
 
-	private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+	private static final Logger log = LoggerFactory.getLogger(GithubMilestones.class);
 
 	private final Github github;
 	private final ReleaserProperties properties;
diff --git a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/git/ProjectGitHandler.java b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/git/ProjectGitHandler.java
index e1e23e8b..c9b11d8d 100644
--- a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/git/ProjectGitHandler.java
+++ b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/git/ProjectGitHandler.java
@@ -22,7 +22,7 @@ import org.springframework.util.StringUtils;
  */
 public class ProjectGitHandler implements ReleaserPropertiesAware {
 
-	private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+	private static final Logger log = LoggerFactory.getLogger(ProjectGitHandler.class);
 
 	private static final String MSG = "Bumping versions";
 	private static final String PRE_RELEASE_MSG = "Update SNAPSHOT to %s";
diff --git a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/gradle/GradleUpdater.java b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/gradle/GradleUpdater.java
index 14c664ca..ad733f1c 100644
--- a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/gradle/GradleUpdater.java
+++ b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/gradle/GradleUpdater.java
@@ -26,7 +26,7 @@ import org.springframework.cloud.release.internal.pom.Projects;
  */
 public class GradleUpdater implements ReleaserPropertiesAware {
 
-	private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+	private static final Logger log = LoggerFactory.getLogger(GradleUpdater.class);
 
 	private ReleaserProperties properties;
 
diff --git a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/pom/PomUpdater.java b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/pom/PomUpdater.java
index b9999bda..eefc9229 100644
--- a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/pom/PomUpdater.java
+++ b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/pom/PomUpdater.java
@@ -49,7 +49,7 @@ import static org.springframework.util.StringUtils.isEmpty;
  */
 class PomUpdater {
 
-	private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+	private static final Logger log = LoggerFactory.getLogger(PomUpdater.class);
 
 	private final PomReader pomReader = new PomReader();
 	private final PomWriter pomWriter = new PomWriter();
@@ -275,7 +275,7 @@ class ModelWrapper {
 
 class PomWriter {
 
-	private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+	private static final Logger log = LoggerFactory.getLogger(PomWriter.class);
 
 	void write(ModelWrapper wrapper, Versions versions, File pom) {
 		try {
diff --git a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/pom/SCReleasePomParser.java b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/pom/SCReleasePomParser.java
index fdcf2665..03cfd4c2 100644
--- a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/pom/SCReleasePomParser.java
+++ b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/pom/SCReleasePomParser.java
@@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory;
  */
 class SCReleasePomParser {
 
-	private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+	private static final Logger log = LoggerFactory.getLogger(SCReleasePomParser.class);
 
 	private static final String STARTER_POM = "spring-cloud-starter-parent/pom.xml";
 	private static final String DEPENDENCIES_POM = "spring-cloud-dependencies/pom.xml";
diff --git a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/project/ProjectBuilder.java b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/project/ProjectBuilder.java
index 9f83e1a5..951f81d9 100644
--- a/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/project/ProjectBuilder.java
+++ b/spring-cloud-release-tools-core/src/main/java/org/springframework/cloud/release/internal/project/ProjectBuilder.java
@@ -170,7 +170,7 @@ public class ProjectBuilder implements ReleaserPropertiesAware {
 }
 
 class ProcessExecutor implements ReleaserPropertiesAware {
-	private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+	private static final Logger log = LoggerFactory.getLogger(ProcessExecutor.class);
 
 	private ReleaserProperties properties;
 
diff --git a/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/OptionsProcessor.java b/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/OptionsProcessor.java
index 87b27ecc..93f59396 100644
--- a/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/OptionsProcessor.java
+++ b/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/OptionsProcessor.java
@@ -16,7 +16,7 @@ import org.springframework.util.StringUtils;
  * @author Marcin Grzejszczak
  */
 class OptionsProcessor {
-	private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+	private static final Logger log = LoggerFactory.getLogger(OptionsProcessor.class);
 
 	private final Releaser releaser;
 	private final ReleaserProperties properties;
diff --git a/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/Task.java b/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/Task.java
index ff82e4f0..9b95e137 100644
--- a/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/Task.java
+++ b/spring-cloud-release-tools-spring/src/main/java/org/springframework/cloud/release/internal/spring/Task.java
@@ -13,7 +13,7 @@ class Task {
 
 	static StepSkipper stepSkipper = new ConsoleInputStepSkipper();
 
-	private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+	private static final Logger log = LoggerFactory.getLogger(Task.class);
 	private static final String MSG = "\nPress 'q' to quit, 's' to skip, any key to continue\n\n";
 
 	final String name;