diff --git a/FDBLibTLS/local.mk b/FDBLibTLS/local.mk
index 0b6eac817c..4f151f4711 100644
--- a/FDBLibTLS/local.mk
+++ b/FDBLibTLS/local.mk
@@ -5,7 +5,7 @@ FDBLibTLS_LDFLAGS += -Wl,-soname,FDBLibTLS.so -Wl,--version-script=FDBLibTLS/FDB
 
 # The plugin isn't a typical library, so it feels more sensible to have a copy
 # of it in bin/.
-bin/FDBLibTLS.$(DLEXT): lib/libFDBLibTLS.$(DLEXT)
+bin/fdb-libressl-plugin.$(DLEXT): lib/libFDBLibTLS.$(DLEXT)
 	@cp $< $@
 
-TARGETS += bin/FDBLibTLS.$(DLEXT)
+TARGETS += bin/fdb-libressl-plugin.$(DLEXT)
diff --git a/build/packages.mk b/build/packages.mk
index a17ad1c1b5..425fd09526 100644
--- a/build/packages.mk
+++ b/build/packages.mk
@@ -121,7 +121,7 @@ ifeq ($(PLATFORM),linux)
 	@rm -f packages/foundationdb-server-*.rpm packages/foundationdb-clients-*.rpm
 	@packaging/rpm/buildrpms.sh $(VERSION) $(PKGRELEASE)
 
-  FDBTLS: bin/FDBLibTLS.$(DLEXT)
+  FDBTLS: bin/fdb-libressl-plugin.$(DLEXT)
 
   packages: DEB RPM JAVA_RELEASE FDBTESTS FDBHEADERS FDBTLS
 
diff --git a/documentation/sphinx/source/tls.rst b/documentation/sphinx/source/tls.rst
index c93dc74aa9..c675bae7d0 100644
--- a/documentation/sphinx/source/tls.rst
+++ b/documentation/sphinx/source/tls.rst
@@ -79,9 +79,9 @@ Plugin default location
 
 Similarly, if a value is not specified for the parameter ``tls_plugin``, the file will be specified by the environment variable ``FDB_TLS_PLUGIN`` or, if this variable is not set, the system-dependent location:
 
-  * Linux: ``/usr/lib/foundationdb/plugins/FDBLibTLS.so``
-  * macOS: ``/usr/local/foundationdb/plugins/FDBLibTLS.dylib``
-  * Windows: ``C:\Program Files\foundationdb\plugins\FDBLibTLS.dll``
+  * Linux: ``/usr/lib/foundationdb/plugins/fdb-libressl-plugin.so``
+  * macOS: ``/usr/local/foundationdb/plugins/fdb-libressl-plugin.dylib``
+  * Windows: ``C:\Program Files\foundationdb\plugins\fdb-libressl-plugin.dll``
 
 On Windows, this location will be relative to the chosen installation location. The environment variable ``FOUNDATIONDB_INSTALL_PATH`` will be used in place of ``C:\Program Files\foundationdb\`` to determine this location.
 
@@ -183,11 +183,11 @@ If the default checking of the certificate chain is too stringent, the verificat
 =====================  =============================================================
 Setting                Result
 =====================  =============================================================
-``Check.Valid=0``      Sets the current process to disable all further verification 
+``Check.Valid=0``      Sets the current process to disable all further verification
                        of a peer certificate.
-``Check.Unexpired=0``  Disables date checking of peer certificates. If the clocks in 
-                       the cluster and between the clients and servers are not to be 
-                       trusted, setting this value to ``0`` can allow communications 
+``Check.Unexpired=0``  Disables date checking of peer certificates. If the clocks in
+                       the cluster and between the clients and servers are not to be
+                       trusted, setting this value to ``0`` can allow communications
                        to proceed.
 =====================  =============================================================