diff --git a/core/committer/noopssinglechain/client.go b/core/deliverservice/client.go
similarity index 99%
rename from core/committer/noopssinglechain/client.go
rename to core/deliverservice/client.go
index 98412e02fcc..97afcf82495 100644
--- a/core/committer/noopssinglechain/client.go
+++ b/core/deliverservice/client.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package noopssinglechain
+package deliverclient
 
 import (
 	"math"
diff --git a/peer/node/start.go b/peer/node/start.go
index 982aac91201..74568da8166 100755
--- a/peer/node/start.go
+++ b/peer/node/start.go
@@ -30,7 +30,7 @@ import (
 	"github.com/hyperledger/fabric/core"
 	"github.com/hyperledger/fabric/core/chaincode"
 	"github.com/hyperledger/fabric/core/comm"
-	"github.com/hyperledger/fabric/core/committer/noopssinglechain"
+	"github.com/hyperledger/fabric/core/deliverservice"
 	"github.com/hyperledger/fabric/core/endorser"
 	"github.com/hyperledger/fabric/core/ledger/ledgermgmt"
 	"github.com/hyperledger/fabric/core/peer"
@@ -174,14 +174,14 @@ func serve(args []string) error {
 			panic(fmt.Sprintf("Unable to get committer for [%s]", chainID))
 		}
 
-		//this shoul not need the chainID. Delivery should be
+		//this should not need the chainID. Delivery should be
 		//split up into network part and chain part. This should
 		//only init the network part...TBD, part of Join work
-		deliverService := noopssinglechain.NewDeliverService(chainID)
+		deliver := deliverclient.NewDeliverService(chainID)
 
-		deliverService.Start(commit)
+		deliver.Start(commit)
 
-		defer noopssinglechain.StopDeliveryService(deliverService)
+		defer deliverclient.StopDeliveryService(deliver)
 	}
 
 	logger.Infof("Starting peer with ID=%s, network ID=%s, address=%s",