diff --git a/.baseline/checkstyle/checkstyle.xml b/.baseline/checkstyle/checkstyle.xml
index 268ebe3fc..f541b63e2 100644
--- a/.baseline/checkstyle/checkstyle.xml
+++ b/.baseline/checkstyle/checkstyle.xml
@@ -469,7 +469,7 @@
         <module name="NestedTryDepth"/> <!-- Java Coding Guide: Try/catch blocks: never nested -->
         <module name="NonEmptyAtclauseDescription"/> <!-- Java Style Guide: At-clauses -->
         <module name="ParameterName"> <!-- Java Style Guide: Parameter names -->
-            <property name="format" value="^[a-z][a-zA-Z0-9]+$"/>
+            <property name="format" value="^_?[a-z][a-zA-Z0-9]+$"/>
             <message key="name.invalidPattern" value="Parameter name ''{0}'' must match pattern ''{1}''."/>
         </module>
         <module name="SingleLineJavadoc"/> <!-- Java Style Guide: General form -->
diff --git a/build.gradle b/build.gradle
index 79d947083..262b8fac0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         classpath 'com.palantir.gradle.revapi:gradle-revapi:0.3.0'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
         classpath 'com.netflix.nebula:nebula-publishing-plugin:13.6.1'
-        classpath 'com.palantir.baseline:gradle-baseline-java:2.4.0'
+        classpath 'com.palantir.baseline:gradle-baseline-java:2.10.1'
         classpath 'com.palantir.gradle.gitversion:gradle-git-version:0.12.2'
     }
 }
diff --git a/junit-resource-poller/src/main/java/com/palantir/junit/FailureCachingHttpPollingExtension.java b/junit-resource-poller/src/main/java/com/palantir/junit/FailureCachingHttpPollingExtension.java
index b62331294..9dc33681c 100644
--- a/junit-resource-poller/src/main/java/com/palantir/junit/FailureCachingHttpPollingExtension.java
+++ b/junit-resource-poller/src/main/java/com/palantir/junit/FailureCachingHttpPollingExtension.java
@@ -38,7 +38,7 @@ private FailureCachingHttpPollingExtension(HttpPollingResource poller) {
     }
 
     @Override
-    public void beforeAll(ExtensionContext context) {
+    public void beforeAll(ExtensionContext _context) {
         Throwable previousError = maybeError.get();
         if (previousError == null) {
             try {
diff --git a/junit-resource-poller/src/main/java/com/palantir/junit/HttpPollingExtension.java b/junit-resource-poller/src/main/java/com/palantir/junit/HttpPollingExtension.java
index 1ea864e19..82b61567a 100644
--- a/junit-resource-poller/src/main/java/com/palantir/junit/HttpPollingExtension.java
+++ b/junit-resource-poller/src/main/java/com/palantir/junit/HttpPollingExtension.java
@@ -29,7 +29,7 @@ private HttpPollingExtension(HttpPollingResource delegate) {
     }
 
     @Override
-    public void beforeAll(ExtensionContext context) {
+    public void beforeAll(ExtensionContext _context) {
         delegate.before();
     }