diff --git a/MongoDB/include/Poco/MongoDB/QueryRequest.h b/MongoDB/include/Poco/MongoDB/QueryRequest.h
index f953e6117..001393571 100644
--- a/MongoDB/include/Poco/MongoDB/QueryRequest.h
+++ b/MongoDB/include/Poco/MongoDB/QueryRequest.h
@@ -105,12 +105,12 @@ public:
 		/// Sets the number to return (limit)
 
 
-	Document& query();
-		/// Returns the query document
+	Document& selector();
+		/// Returns the selector document
 
 
 	Document& returnFieldSelector();
-		/// Returns the selector document
+		/// Returns the field selector document
 
 
 protected:
@@ -128,7 +128,7 @@ private:
 
 	Int32 _numberToReturn;
 
-	Document _query;
+	Document _selector;
 
 	Document _returnFieldSelector;
 };
@@ -152,9 +152,9 @@ inline std::string QueryRequest::fullCollectionName() const
 }
 
 
-inline Document& QueryRequest::query()
+inline Document& QueryRequest::selector()
 {
-	return _query;
+	return _selector;
 }
 
 
diff --git a/MongoDB/src/Database.cpp b/MongoDB/src/Database.cpp
index e5be810f6..d34246851 100644
--- a/MongoDB/src/Database.cpp
+++ b/MongoDB/src/Database.cpp
@@ -75,7 +75,7 @@ Document::Ptr Database::getLastErrorDoc(Connection& connection) const
 
 	Poco::SharedPtr<Poco::MongoDB::QueryRequest> request = createQueryRequest("$cmd");
 	request->setNumberToReturn(1);
-	request->query().add("getLastError", 1);
+	request->selector().add("getLastError", 1);
 
 	Poco::MongoDB::ResponseMessage response;
 	connection.sendRequest(*request, response);
@@ -110,7 +110,7 @@ Poco::SharedPtr<Poco::MongoDB::QueryRequest> Database::createCountRequest(const
 {
 	Poco::SharedPtr<Poco::MongoDB::QueryRequest> request = createQueryRequest("$cmd");
 	request->setNumberToReturn(1);
-	request->query().add("count", collectionName);
+	request->selector().add("count", collectionName);
 	return request;
 }
 
diff --git a/MongoDB/src/QueryRequest.cpp b/MongoDB/src/QueryRequest.cpp
index 270075abe..6fb32bf46 100644
--- a/MongoDB/src/QueryRequest.cpp
+++ b/MongoDB/src/QueryRequest.cpp
@@ -49,7 +49,7 @@ QueryRequest::QueryRequest(const std::string& collectionName, QueryRequest::Flag
 	_fullCollectionName(collectionName),
 	_numberToSkip(0), 
 	_numberToReturn(100),
-	_query(), 
+	_selector(),
 	_returnFieldSelector()
 {
 }
@@ -65,7 +65,7 @@ void QueryRequest::buildRequest(BinaryWriter& writer)
 	BSONWriter(writer).writeCString(_fullCollectionName);
 	writer << _numberToSkip;
 	writer << _numberToReturn;
-	_query.write(writer);
+	_selector.write(writer);
 
 	if ( ! _returnFieldSelector.empty() )
 	{
diff --git a/MongoDB/src/ReplicaSet.cpp b/MongoDB/src/ReplicaSet.cpp
index be26aa79b..6919a3faa 100644
--- a/MongoDB/src/ReplicaSet.cpp
+++ b/MongoDB/src/ReplicaSet.cpp
@@ -78,7 +78,7 @@ Connection::Ptr ReplicaSet::isMaster(const Net::SocketAddress& address)
 
 		QueryRequest request("admin.$cmd");
 		request.setNumberToReturn(1);
-		request.query().add("isMaster", 1);
+		request.selector().add("isMaster", 1);
 
 		ResponseMessage response;
 		conn->sendRequest(request, response);
diff --git a/MongoDB/testsuite/src/MongoDBTest.cpp b/MongoDB/testsuite/src/MongoDBTest.cpp
index 948cbd263..aef99fe09 100644
--- a/MongoDB/testsuite/src/MongoDBTest.cpp
+++ b/MongoDB/testsuite/src/MongoDBTest.cpp
@@ -124,7 +124,7 @@ void MongoDBTest::testQueryRequest()
 	}
 
 	Poco::MongoDB::QueryRequest request("team.players");
-	request.query().add("lastname" , std::string("Braem"));
+	request.selector().add("lastname" , std::string("Braem"));
 	request.setNumberToReturn(1);
 
 	Poco::MongoDB::ResponseMessage response;
@@ -173,7 +173,7 @@ void MongoDBTest::testDBQueryRequest()
 
 	Database db("team");
 	Poco::SharedPtr<Poco::MongoDB::QueryRequest> request = db.createQueryRequest("players");
-	request->query().add("lastname" , std::string("Braem"));
+	request->selector().add("lastname" , std::string("Braem"));
 
 	Poco::MongoDB::ResponseMessage response;
 	_mongo.sendRequest(*request, response);
@@ -219,7 +219,7 @@ void MongoDBTest::testCountCommand()
 
 	Poco::MongoDB::QueryRequest request("team.$cmd");
 	request.setNumberToReturn(1);
-	request.query().add("count", std::string("players"));
+	request.selector().add("count", std::string("players"));
 
 	Poco::MongoDB::ResponseMessage response;
 
@@ -331,7 +331,7 @@ void MongoDBTest::testCursorRequest()
 
 	Poco::MongoDB::QueryRequest drop("team.$cmd");
 	drop.setNumberToReturn(1);
-	drop.query().add("drop", std::string("numbers"));
+	drop.selector().add("drop", std::string("numbers"));
 
 	Poco::MongoDB::ResponseMessage responseDrop;
 	_mongo.sendRequest(drop, responseDrop);
@@ -353,7 +353,7 @@ void MongoDBTest::testBuildInfo()
 
 	Poco::MongoDB::QueryRequest request("team.$cmd");
 	request.setNumberToReturn(1);
-	request.query().add("buildInfo", 1);
+	request.selector().add("buildInfo", 1);
 
 	Poco::MongoDB::ResponseMessage response;
 
@@ -388,7 +388,7 @@ void MongoDBTest::testConnectionPool()
 
 	Poco::MongoDB::QueryRequest request("team.$cmd");
 	request.setNumberToReturn(1);
-	request.query().add("count", std::string("players"));
+	request.selector().add("count", std::string("players"));
 
 	Poco::MongoDB::ResponseMessage response;
 	((Connection::Ptr) pooledConnection)->sendRequest(request, response);