diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/application/ApplicationImpl.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/application/ApplicationImpl.java
index 7ca265c10..6ecdf18f7 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/application/ApplicationImpl.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/application/ApplicationImpl.java
@@ -13,7 +13,7 @@ import edu.cornell.mannlib.vitro.webapp.modules.ComponentStartupStatus;
 import edu.cornell.mannlib.vitro.webapp.modules.fileStorage.FileStorage;
 import edu.cornell.mannlib.vitro.webapp.modules.imageProcessor.ImageProcessor;
 import edu.cornell.mannlib.vitro.webapp.modules.searchEngine.SearchEngine;
-import edu.cornell.mannlib.vitro.webapp.searchengine.SearchEngineWrapper;
+import edu.cornell.mannlib.vitro.webapp.searchengine.InstrumentedSearchEngineWrapper;
 import edu.cornell.mannlib.vitro.webapp.searchengine.solr.SolrSearchEngine;
 import edu.cornell.mannlib.vitro.webapp.startup.ComponentStartupStatusImpl;
 import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
@@ -85,7 +85,7 @@ public class ApplicationImpl implements Application {
 				ComponentStartupStatus css = new ComponentStartupStatusImpl(
 						this, ss);
 
-				SearchEngine searchEngine = new SearchEngineWrapper(
+				SearchEngine searchEngine = new InstrumentedSearchEngineWrapper(
 						new SolrSearchEngine());
 				searchEngine.startup(application, css);
 				application.setSearchEngine(searchEngine);
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/searchengine/SearchEngineWrapper.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/searchengine/InstrumentedSearchEngineWrapper.java
similarity index 93%
rename from webapp/src/edu/cornell/mannlib/vitro/webapp/searchengine/SearchEngineWrapper.java
rename to webapp/src/edu/cornell/mannlib/vitro/webapp/searchengine/InstrumentedSearchEngineWrapper.java
index 9b59f232f..137506630 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/searchengine/SearchEngineWrapper.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/searchengine/InstrumentedSearchEngineWrapper.java
@@ -20,16 +20,18 @@ import edu.cornell.mannlib.vitro.webapp.modules.searchEngine.SearchQuery;
 import edu.cornell.mannlib.vitro.webapp.modules.searchEngine.SearchResponse;
 
 /**
- * TODO
+ * Manages the life-cycle of the SearchEngine. Adds logging, controlled by
+ * DeveloperSettings.
  */
-public class SearchEngineWrapper implements SearchEngine {
-	private static final Log log = LogFactory.getLog(SearchEngineWrapper.class);
+public class InstrumentedSearchEngineWrapper implements SearchEngine {
+	private static final Log log = LogFactory
+			.getLog(InstrumentedSearchEngineWrapper.class);
 
 	private final SearchEngine innerEngine;
 
 	private volatile LifecycleState lifecycleState = NEW;
 
-	public SearchEngineWrapper(SearchEngine innerEngine) {
+	public InstrumentedSearchEngineWrapper(SearchEngine innerEngine) {
 		if (innerEngine == null) {
 			throw new NullPointerException("innerEngine may not be null.");
 		}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/searchengine/SearchEngineLogger.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/searchengine/SearchEngineLogger.java
index 268f7bcfc..b46cb6314 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/searchengine/SearchEngineLogger.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/searchengine/SearchEngineLogger.java
@@ -254,7 +254,7 @@ public abstract class SearchEngineLogger implements AutoCloseable {
 
 		QueryLogger(SearchQuery query) {
 			this.query = query;
-			this.stackTrace = new StackTraceUtility(SearchEngineWrapper.class,
+			this.stackTrace = new StackTraceUtility(InstrumentedSearchEngineWrapper.class,
 					true);
 			this.passesRestrictions = passesQueryRestriction()
 					&& passesStackRestriction();