diff --git a/archiver.go b/archiver.go
index 76108921a..a7c15fc60 100644
--- a/archiver.go
+++ b/archiver.go
@@ -30,7 +30,7 @@ var archiverAllowAllFiles = func(string, os.FileInfo) bool { return true }
 
 // Archiver is used to backup a set of directories.
 type Archiver struct {
-	s *repo.Server
+	s *repo.Repository
 
 	blobToken chan struct{}
 
@@ -39,7 +39,7 @@ type Archiver struct {
 }
 
 // NewArchiver returns a new archiver.
-func NewArchiver(s *repo.Server) *Archiver {
+func NewArchiver(s *repo.Repository) *Archiver {
 	arch := &Archiver{
 		s:         s,
 		blobToken: make(chan struct{}, maxConcurrentBlobs),
diff --git a/cache.go b/cache.go
index 83321a363..902aae2ea 100644
--- a/cache.go
+++ b/cache.go
@@ -18,7 +18,7 @@ type Cache struct {
 	base string
 }
 
-func NewCache(s *repo.Server) (*Cache, error) {
+func NewCache(s *repo.Repository) (*Cache, error) {
 	cacheDir, err := getCacheDir()
 	if err != nil {
 		return nil, err
@@ -106,7 +106,7 @@ func (c *Cache) purge(t backend.Type, subtype string, id backend.ID) error {
 }
 
 // Clear removes information from the cache that isn't present in the server any more.
-func (c *Cache) Clear(s *repo.Server) error {
+func (c *Cache) Clear(s *repo.Repository) error {
 	list, err := c.list(backend.Snapshot)
 	if err != nil {
 		return err
diff --git a/cmd/restic/cmd_find.go b/cmd/restic/cmd_find.go
index 43f0c45da..9ffae8bdf 100644
--- a/cmd/restic/cmd_find.go
+++ b/cmd/restic/cmd_find.go
@@ -59,7 +59,7 @@ func parseTime(str string) (time.Time, error) {
 	return time.Time{}, fmt.Errorf("unable to parse time: %q", str)
 }
 
-func (c CmdFind) findInTree(s *repo.Server, id backend.ID, path string) ([]findResult, error) {
+func (c CmdFind) findInTree(s *repo.Repository, id backend.ID, path string) ([]findResult, error) {
 	debug.Log("restic.find", "checking tree %v\n", id)
 	tree, err := restic.LoadTree(s, id)
 	if err != nil {
@@ -105,7 +105,7 @@ func (c CmdFind) findInTree(s *repo.Server, id backend.ID, path string) ([]findR
 	return results, nil
 }
 
-func (c CmdFind) findInSnapshot(s *repo.Server, name string) error {
+func (c CmdFind) findInSnapshot(s *repo.Repository, name string) error {
 	debug.Log("restic.find", "searching in snapshot %s\n  for entries within [%s %s]", name, c.oldest, c.newest)
 
 	id, err := backend.ParseID(name)
diff --git a/cmd/restic/cmd_fsck.go b/cmd/restic/cmd_fsck.go
index 714753014..5beedf190 100644
--- a/cmd/restic/cmd_fsck.go
+++ b/cmd/restic/cmd_fsck.go
@@ -34,7 +34,7 @@ func init() {
 	}
 }
 
-func fsckFile(opts CmdFsck, s *repo.Server, IDs []backend.ID) (uint64, error) {
+func fsckFile(opts CmdFsck, s *repo.Repository, IDs []backend.ID) (uint64, error) {
 	debug.Log("restic.fsckFile", "checking file %v", IDs)
 	var bytes uint64
 
@@ -77,7 +77,7 @@ func fsckFile(opts CmdFsck, s *repo.Server, IDs []backend.ID) (uint64, error) {
 	return bytes, nil
 }
 
-func fsckTree(opts CmdFsck, s *repo.Server, id backend.ID) error {
+func fsckTree(opts CmdFsck, s *repo.Repository, id backend.ID) error {
 	debug.Log("restic.fsckTree", "checking tree %v", id.Str())
 
 	tree, err := restic.LoadTree(s, id)
@@ -157,7 +157,7 @@ func fsckTree(opts CmdFsck, s *repo.Server, id backend.ID) error {
 	return firstErr
 }
 
-func fsckSnapshot(opts CmdFsck, s *repo.Server, id backend.ID) error {
+func fsckSnapshot(opts CmdFsck, s *repo.Repository, id backend.ID) error {
 	debug.Log("restic.fsck", "checking snapshot %v\n", id)
 
 	sn, err := restic.LoadSnapshot(s, id)
diff --git a/cmd/restic/cmd_key.go b/cmd/restic/cmd_key.go
index 1fbccc084..3337829ac 100644
--- a/cmd/restic/cmd_key.go
+++ b/cmd/restic/cmd_key.go
@@ -21,7 +21,7 @@ func init() {
 	}
 }
 
-func listKeys(s *repo.Server) error {
+func listKeys(s *repo.Repository) error {
 	tab := NewTable()
 	tab.Header = fmt.Sprintf(" %-10s  %-10s  %-10s  %s", "ID", "User", "Host", "Created")
 	tab.RowFormat = "%s%-10s  %-10s  %-10s  %s"
@@ -56,7 +56,7 @@ func listKeys(s *repo.Server) error {
 	return nil
 }
 
-func addKey(s *repo.Server) error {
+func addKey(s *repo.Repository) error {
 	pw := readPassword("RESTIC_NEWPASSWORD", "enter password for new key: ")
 	pw2 := readPassword("RESTIC_NEWPASSWORD", "enter password again: ")
 
@@ -74,7 +74,7 @@ func addKey(s *repo.Server) error {
 	return nil
 }
 
-func deleteKey(s *repo.Server, name string) error {
+func deleteKey(s *repo.Repository, name string) error {
 	if name == s.KeyName() {
 		return errors.New("refusing to remove key currently used to access repository")
 	}
@@ -88,7 +88,7 @@ func deleteKey(s *repo.Server, name string) error {
 	return nil
 }
 
-func changePassword(s *repo.Server) error {
+func changePassword(s *repo.Repository) error {
 	pw := readPassword("RESTIC_NEWPASSWORD", "enter password for new key: ")
 	pw2 := readPassword("RESTIC_NEWPASSWORD", "enter password again: ")
 
diff --git a/cmd/restic/cmd_ls.go b/cmd/restic/cmd_ls.go
index d31aaaf8c..28c9d37ab 100644
--- a/cmd/restic/cmd_ls.go
+++ b/cmd/restic/cmd_ls.go
@@ -38,7 +38,7 @@ func printNode(prefix string, n *restic.Node) string {
 	}
 }
 
-func printTree(prefix string, s *repo.Server, id backend.ID) error {
+func printTree(prefix string, s *repo.Repository, id backend.ID) error {
 	tree, err := restic.LoadTree(s, id)
 	if err != nil {
 		return err
diff --git a/cmd/restic/main.go b/cmd/restic/main.go
index d87f6aeec..22266b538 100644
--- a/cmd/restic/main.go
+++ b/cmd/restic/main.go
@@ -72,7 +72,7 @@ func (cmd CmdInit) Execute(args []string) error {
 		os.Exit(1)
 	}
 
-	s := repo.NewServer(be)
+	s := repo.New(be)
 	err = s.Init(pw)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "creating key in backend at %s failed: %v\n", opts.Repo, err)
@@ -133,7 +133,7 @@ func create(u string) (backend.Backend, error) {
 	return sftp.Create(url.Path[1:], "ssh", args...)
 }
 
-func OpenRepo() (*repo.Server, error) {
+func OpenRepo() (*repo.Repository, error) {
 	if opts.Repo == "" {
 		return nil, errors.New("Please specify repository location (-r)")
 	}
@@ -143,7 +143,7 @@ func OpenRepo() (*repo.Server, error) {
 		return nil, err
 	}
 
-	s := repo.NewServer(be)
+	s := repo.New(be)
 
 	err = s.SearchKey(readPassword("RESTIC_PASSWORD", "enter password for repository: "))
 	if err != nil {
diff --git a/node.go b/node.go
index 023ce4463..b11ecf60b 100644
--- a/node.go
+++ b/node.go
@@ -103,7 +103,7 @@ func nodeTypeFromFileInfo(fi os.FileInfo) string {
 }
 
 // CreateAt creates the node at the given path and restores all the meta data.
-func (node *Node) CreateAt(path string, s *repo.Server) error {
+func (node *Node) CreateAt(path string, s *repo.Repository) error {
 	switch node.Type {
 	case "dir":
 		if err := node.createDirAt(path); err != nil {
@@ -176,7 +176,7 @@ func (node Node) createDirAt(path string) error {
 	return nil
 }
 
-func (node Node) createFileAt(path string, s *repo.Server) error {
+func (node Node) createFileAt(path string, s *repo.Repository) error {
 	f, err := os.OpenFile(path, os.O_CREATE|os.O_WRONLY, 0600)
 	defer f.Close()
 
diff --git a/repo/key.go b/repo/key.go
index 7ea31407b..c60909f21 100644
--- a/repo/key.go
+++ b/repo/key.go
@@ -49,12 +49,12 @@ type Key struct {
 
 // createMasterKey creates a new master key in the given backend and encrypts
 // it with the password.
-func createMasterKey(s *Server, password string) (*Key, error) {
+func createMasterKey(s *Repository, password string) (*Key, error) {
 	return AddKey(s, password, nil)
 }
 
 // OpenKey tries do decrypt the key specified by name with the given password.
-func OpenKey(s *Server, name string, password string) (*Key, error) {
+func OpenKey(s *Repository, name string, password string) (*Key, error) {
 	k, err := LoadKey(s, name)
 	if err != nil {
 		return nil, err
@@ -94,7 +94,7 @@ func OpenKey(s *Server, name string, password string) (*Key, error) {
 
 // SearchKey tries to decrypt all keys in the backend with the given password.
 // If none could be found, ErrNoKeyFound is returned.
-func SearchKey(s *Server, password string) (*Key, error) {
+func SearchKey(s *Repository, password string) (*Key, error) {
 	// try all keys in repo
 	done := make(chan struct{})
 	defer close(done)
@@ -111,7 +111,7 @@ func SearchKey(s *Server, password string) (*Key, error) {
 }
 
 // LoadKey loads a key from the backend.
-func LoadKey(s *Server, name string) (*Key, error) {
+func LoadKey(s *Repository, name string) (*Key, error) {
 	// extract data from repo
 	rd, err := s.be.Get(backend.Key, name)
 	if err != nil {
@@ -131,7 +131,7 @@ func LoadKey(s *Server, name string) (*Key, error) {
 }
 
 // AddKey adds a new key to an already existing repository.
-func AddKey(s *Server, password string, template *crypto.Key) (*Key, error) {
+func AddKey(s *Repository, password string, template *crypto.Key) (*Key, error) {
 	// fill meta data about key
 	newkey := &Key{
 		Created: time.Now(),
diff --git a/repo/server.go b/repo/server.go
index 9bafa01b7..9f4d91622 100644
--- a/repo/server.go
+++ b/repo/server.go
@@ -26,8 +26,8 @@ type Config struct {
 	ChunkerPolynomial chunker.Pol `json:"chunker_polynomial"`
 }
 
-// Server is used to access a repository in a backend.
-type Server struct {
+// Repository is used to access a repository in a backend.
+type Repository struct {
 	be      backend.Backend
 	Config  Config
 	key     *crypto.Key
@@ -38,8 +38,8 @@ type Server struct {
 	packs []*pack.Packer
 }
 
-func NewServer(be backend.Backend) *Server {
-	return &Server{
+func New(be backend.Backend) *Repository {
+	return &Repository{
 		be:  be,
 		idx: NewIndex(),
 	}
@@ -48,31 +48,31 @@ func NewServer(be backend.Backend) *Server {
 // Find loads the list of all blobs of type t and searches for names which start
 // with prefix. If none is found, nil and ErrNoIDPrefixFound is returned. If
 // more than one is found, nil and ErrMultipleIDMatches is returned.
-func (s *Server) Find(t backend.Type, prefix string) (string, error) {
+func (s *Repository) Find(t backend.Type, prefix string) (string, error) {
 	return backend.Find(s.be, t, prefix)
 }
 
 // FindSnapshot takes a string and tries to find a snapshot whose ID matches
 // the string as closely as possible.
-func (s *Server) FindSnapshot(name string) (string, error) {
+func (s *Repository) FindSnapshot(name string) (string, error) {
 	return backend.FindSnapshot(s.be, name)
 }
 
 // PrefixLength returns the number of bytes required so that all prefixes of
 // all IDs of type t are unique.
-func (s *Server) PrefixLength(t backend.Type) (int, error) {
+func (s *Repository) PrefixLength(t backend.Type) (int, error) {
 	return backend.PrefixLength(s.be, t)
 }
 
 // Load tries to load and decrypt content identified by t and id from the
 // backend.
-func (s *Server) Load(t backend.Type, id backend.ID) ([]byte, error) {
-	debug.Log("Server.Load", "load %v with id %v", t, id.Str())
+func (s *Repository) Load(t backend.Type, id backend.ID) ([]byte, error) {
+	debug.Log("Repository.Load", "load %v with id %v", t, id.Str())
 
 	// load blob from pack
 	rd, err := s.be.Get(t, id.String())
 	if err != nil {
-		debug.Log("Server.Load", "error loading %v: %v", id.Str(), err)
+		debug.Log("Repository.Load", "error loading %v: %v", id.Str(), err)
 		return nil, err
 	}
 
@@ -102,26 +102,26 @@ func (s *Server) Load(t backend.Type, id backend.ID) ([]byte, error) {
 
 // LoadBlob tries to load and decrypt content identified by t and id from a
 // pack from the backend.
-func (s *Server) LoadBlob(t pack.BlobType, id backend.ID) ([]byte, error) {
-	debug.Log("Server.LoadBlob", "load %v with id %v", t, id.Str())
+func (s *Repository) LoadBlob(t pack.BlobType, id backend.ID) ([]byte, error) {
+	debug.Log("Repository.LoadBlob", "load %v with id %v", t, id.Str())
 	// lookup pack
 	packID, tpe, offset, length, err := s.idx.Lookup(id)
 	if err != nil {
-		debug.Log("Server.LoadBlob", "id %v not found in index: %v", id.Str(), err)
+		debug.Log("Repository.LoadBlob", "id %v not found in index: %v", id.Str(), err)
 		return nil, err
 	}
 
 	if tpe != t {
-		debug.Log("Server.LoadBlob", "wrong type returned for %v: wanted %v, got %v", id.Str(), t, tpe)
+		debug.Log("Repository.LoadBlob", "wrong type returned for %v: wanted %v, got %v", id.Str(), t, tpe)
 		return nil, fmt.Errorf("blob has wrong type %v (wanted: %v)", tpe, t)
 	}
 
-	debug.Log("Server.LoadBlob", "id %v found in pack %v at offset %v (length %d)", id.Str(), packID.Str(), offset, length)
+	debug.Log("Repository.LoadBlob", "id %v found in pack %v at offset %v (length %d)", id.Str(), packID.Str(), offset, length)
 
 	// load blob from pack
 	rd, err := s.be.GetReader(backend.Data, packID.String(), offset, length)
 	if err != nil {
-		debug.Log("Server.LoadBlob", "error loading pack %v for %v: %v", packID.Str(), id.Str(), err)
+		debug.Log("Repository.LoadBlob", "error loading pack %v for %v: %v", packID.Str(), id.Str(), err)
 		return nil, err
 	}
 
@@ -151,7 +151,7 @@ func (s *Server) LoadBlob(t pack.BlobType, id backend.ID) ([]byte, error) {
 
 // LoadJSONUnpacked decrypts the data and afterwards calls json.Unmarshal on
 // the item.
-func (s *Server) LoadJSONUnpacked(t backend.Type, id backend.ID, item interface{}) error {
+func (s *Repository) LoadJSONUnpacked(t backend.Type, id backend.ID, item interface{}) error {
 	// load blob from backend
 	rd, err := s.be.Get(t, id.String())
 	if err != nil {
@@ -178,7 +178,7 @@ func (s *Server) LoadJSONUnpacked(t backend.Type, id backend.ID, item interface{
 
 // LoadJSONPack calls LoadBlob() to load a blob from the backend, decrypt the
 // data and afterwards call json.Unmarshal on the item.
-func (s *Server) LoadJSONPack(t pack.BlobType, id backend.ID, item interface{}) error {
+func (s *Repository) LoadJSONPack(t pack.BlobType, id backend.ID, item interface{}) error {
 	// lookup pack
 	packID, _, offset, length, err := s.idx.Lookup(id)
 	if err != nil {
@@ -215,16 +215,16 @@ const maxPackers = 200
 
 // findPacker returns a packer for a new blob of size bytes. Either a new one is
 // created or one is returned that already has some blobs.
-func (s *Server) findPacker(size uint) (*pack.Packer, error) {
+func (s *Repository) findPacker(size uint) (*pack.Packer, error) {
 	s.pm.Lock()
 	defer s.pm.Unlock()
 
 	// search for a suitable packer
 	if len(s.packs) > 0 {
-		debug.Log("Server.findPacker", "searching packer for %d bytes\n", size)
+		debug.Log("Repository.findPacker", "searching packer for %d bytes\n", size)
 		for i, p := range s.packs {
 			if p.Size()+size < maxPackSize {
-				debug.Log("Server.findPacker", "found packer %v", p)
+				debug.Log("Repository.findPacker", "found packer %v", p)
 				// remove from list
 				s.packs = append(s.packs[:i], s.packs[i+1:]...)
 				return p, nil
@@ -237,22 +237,22 @@ func (s *Server) findPacker(size uint) (*pack.Packer, error) {
 	if err != nil {
 		return nil, err
 	}
-	debug.Log("Server.findPacker", "create new pack %p", blob)
+	debug.Log("Repository.findPacker", "create new pack %p", blob)
 	return pack.NewPacker(s.key, blob), nil
 }
 
 // insertPacker appends p to s.packs.
-func (s *Server) insertPacker(p *pack.Packer) {
+func (s *Repository) insertPacker(p *pack.Packer) {
 	s.pm.Lock()
 	defer s.pm.Unlock()
 
 	s.packs = append(s.packs, p)
-	debug.Log("Server.insertPacker", "%d packers\n", len(s.packs))
+	debug.Log("Repository.insertPacker", "%d packers\n", len(s.packs))
 }
 
 // savePacker stores p in the backend.
-func (s *Server) savePacker(p *pack.Packer) error {
-	debug.Log("Server.savePacker", "save packer with %d blobs\n", p.Count())
+func (s *Repository) savePacker(p *pack.Packer) error {
+	debug.Log("Repository.savePacker", "save packer with %d blobs\n", p.Count())
 	_, err := p.Finalize()
 	if err != nil {
 		return err
@@ -262,15 +262,15 @@ func (s *Server) savePacker(p *pack.Packer) error {
 	sid := p.ID()
 	err = p.Writer().(backend.Blob).Finalize(backend.Data, sid.String())
 	if err != nil {
-		debug.Log("Server.savePacker", "blob Finalize() error: %v", err)
+		debug.Log("Repository.savePacker", "blob Finalize() error: %v", err)
 		return err
 	}
 
-	debug.Log("Server.savePacker", "saved as %v", sid.Str())
+	debug.Log("Repository.savePacker", "saved as %v", sid.Str())
 
 	// update blobs in the index
 	for _, b := range p.Blobs() {
-		debug.Log("Server.savePacker", "  updating blob %v to pack %v", b.ID.Str(), sid.Str())
+		debug.Log("Repository.savePacker", "  updating blob %v to pack %v", b.ID.Str(), sid.Str())
 		s.idx.Store(b.Type, b.ID, sid, b.Offset, uint(b.Length))
 	}
 
@@ -278,7 +278,7 @@ func (s *Server) savePacker(p *pack.Packer) error {
 }
 
 // countPacker returns the number of open (unfinished) packers.
-func (s *Server) countPacker() int {
+func (s *Repository) countPacker() int {
 	s.pm.Lock()
 	defer s.pm.Unlock()
 
@@ -287,13 +287,13 @@ func (s *Server) countPacker() int {
 
 // Save encrypts data and stores it to the backend as type t. If data is small
 // enough, it will be packed together with other small blobs.
-func (s *Server) Save(t pack.BlobType, data []byte, id backend.ID) (backend.ID, error) {
+func (s *Repository) Save(t pack.BlobType, data []byte, id backend.ID) (backend.ID, error) {
 	if id == nil {
 		// compute plaintext hash
 		id = backend.Hash(data)
 	}
 
-	debug.Log("Server.Save", "save id %v (%v, %d bytes)", id.Str(), t, len(data))
+	debug.Log("Repository.Save", "save id %v (%v, %d bytes)", id.Str(), t, len(data))
 
 	// get buf from the pool
 	ciphertext := getBuf()
@@ -317,12 +317,12 @@ func (s *Server) Save(t pack.BlobType, data []byte, id backend.ID) (backend.ID,
 	// add this id to the index, although we don't know yet in which pack it
 	// will be saved, the entry will be updated when the pack is written.
 	s.idx.Store(t, id, nil, 0, 0)
-	debug.Log("Server.Save", "saving stub for %v (%v) in index", id.Str, t)
+	debug.Log("Repository.Save", "saving stub for %v (%v) in index", id.Str, t)
 
 	// if the pack is not full enough and there are less than maxPackers
 	// packers, put back to the list
 	if packer.Size() < minPackSize && s.countPacker() < maxPackers {
-		debug.Log("Server.Save", "pack is not full enough (%d bytes)", packer.Size())
+		debug.Log("Repository.Save", "pack is not full enough (%d bytes)", packer.Size())
 		s.insertPacker(packer)
 		return id, nil
 	}
@@ -332,8 +332,8 @@ func (s *Server) Save(t pack.BlobType, data []byte, id backend.ID) (backend.ID,
 }
 
 // SaveFrom encrypts data read from rd and stores it in a pack in the backend as type t.
-func (s *Server) SaveFrom(t pack.BlobType, id backend.ID, length uint, rd io.Reader) error {
-	debug.Log("Server.SaveFrom", "save id %v (%v, %d bytes)", id.Str(), t, length)
+func (s *Repository) SaveFrom(t pack.BlobType, id backend.ID, length uint, rd io.Reader) error {
+	debug.Log("Repository.SaveFrom", "save id %v (%v, %d bytes)", id.Str(), t, length)
 	if id == nil {
 		return errors.New("id is nil")
 	}
@@ -353,8 +353,8 @@ func (s *Server) SaveFrom(t pack.BlobType, id backend.ID, length uint, rd io.Rea
 
 // SaveJSON serialises item as JSON and encrypts and saves it in a pack in the
 // backend as type t.
-func (s *Server) SaveJSON(t pack.BlobType, item interface{}) (backend.ID, error) {
-	debug.Log("Server.SaveJSON", "save %v blob", t)
+func (s *Repository) SaveJSON(t pack.BlobType, item interface{}) (backend.ID, error) {
+	debug.Log("Repository.SaveJSON", "save %v blob", t)
 	buf := getBuf()[:0]
 	defer freeBuf(buf)
 
@@ -372,13 +372,13 @@ func (s *Server) SaveJSON(t pack.BlobType, item interface{}) (backend.ID, error)
 
 // SaveJSONUnpacked serialises item as JSON and encrypts and saves it in the
 // backend as type t, without a pack. It returns the storage hash.
-func (s *Server) SaveJSONUnpacked(t backend.Type, item interface{}) (backend.ID, error) {
+func (s *Repository) SaveJSONUnpacked(t backend.Type, item interface{}) (backend.ID, error) {
 	// create file
 	blob, err := s.be.Create()
 	if err != nil {
 		return nil, err
 	}
-	debug.Log("Server.SaveJSONUnpacked", "create new file %p", blob)
+	debug.Log("Repository.SaveJSONUnpacked", "create new file %p", blob)
 
 	// hash
 	hw := backend.NewHashingWriter(blob, sha256.New())
@@ -409,11 +409,11 @@ func (s *Server) SaveJSONUnpacked(t backend.Type, item interface{}) (backend.ID,
 }
 
 // Flush saves all remaining packs.
-func (s *Server) Flush() error {
+func (s *Repository) Flush() error {
 	s.pm.Lock()
 	defer s.pm.Unlock()
 
-	debug.Log("Server.Flush", "manually flushing %d packs", len(s.packs))
+	debug.Log("Repository.Flush", "manually flushing %d packs", len(s.packs))
 
 	for _, p := range s.packs {
 		err := s.savePacker(p)
@@ -426,23 +426,23 @@ func (s *Server) Flush() error {
 	return nil
 }
 
-func (s *Server) Backend() backend.Backend {
+func (s *Repository) Backend() backend.Backend {
 	return s.be
 }
 
-func (s *Server) Index() *Index {
+func (s *Repository) Index() *Index {
 	return s.idx
 }
 
-// SetIndex instructs the server to use the given index.
-func (s *Server) SetIndex(i *Index) {
+// SetIndex instructs the repository to use the given index.
+func (s *Repository) SetIndex(i *Index) {
 	s.idx = i
 }
 
 // SaveIndex saves all new packs in the index in the backend, returned is the
 // storage ID.
-func (s *Server) SaveIndex() (backend.ID, error) {
-	debug.Log("Server.SaveIndex", "Saving index")
+func (s *Repository) SaveIndex() (backend.ID, error) {
+	debug.Log("Repository.SaveIndex", "Saving index")
 
 	// create blob
 	blob, err := s.be.Create()
@@ -450,7 +450,7 @@ func (s *Server) SaveIndex() (backend.ID, error) {
 		return nil, err
 	}
 
-	debug.Log("Server.SaveIndex", "create new pack %p", blob)
+	debug.Log("Repository.SaveIndex", "create new pack %p", blob)
 
 	// hash
 	hw := backend.NewHashingWriter(blob, sha256.New())
@@ -476,15 +476,15 @@ func (s *Server) SaveIndex() (backend.ID, error) {
 		return nil, err
 	}
 
-	debug.Log("Server.SaveIndex", "Saved index as %v", sid.Str())
+	debug.Log("Repository.SaveIndex", "Saved index as %v", sid.Str())
 
 	return sid, nil
 }
 
 // LoadIndex loads all index files from the backend and merges them with the
 // current index.
-func (s *Server) LoadIndex() error {
-	debug.Log("Server.LoadIndex", "Loading index")
+func (s *Repository) LoadIndex() error {
+	debug.Log("Repository.LoadIndex", "Loading index")
 	done := make(chan struct{})
 	defer close(done)
 
@@ -498,8 +498,8 @@ func (s *Server) LoadIndex() error {
 }
 
 // loadIndex loads the index id and merges it with the currently used index.
-func (s *Server) loadIndex(id string) error {
-	debug.Log("Server.loadIndex", "Loading index %v", id[:8])
+func (s *Repository) loadIndex(id string) error {
+	debug.Log("Repository.loadIndex", "Loading index %v", id[:8])
 	before := len(s.idx.pack)
 
 	rd, err := s.be.Get(backend.Index, id)
@@ -517,14 +517,14 @@ func (s *Server) loadIndex(id string) error {
 
 	idx, err := DecodeIndex(decryptRd)
 	if err != nil {
-		debug.Log("Server.loadIndex", "error while decoding index %v: %v", id, err)
+		debug.Log("Repository.loadIndex", "error while decoding index %v: %v", id, err)
 		return err
 	}
 
 	s.idx.Merge(idx)
 
 	after := len(s.idx.pack)
-	debug.Log("Server.loadIndex", "Loaded index %v, added %v blobs", id[:8], after-before)
+	debug.Log("Repository.loadIndex", "Loaded index %v, added %v blobs", id[:8], after-before)
 
 	return nil
 }
@@ -532,7 +532,7 @@ func (s *Server) loadIndex(id string) error {
 const repositoryIDSize = sha256.Size
 const RepositoryVersion = 1
 
-func createConfig(s *Server) (err error) {
+func createConfig(s *Repository) (err error) {
 	s.Config.ChunkerPolynomial, err = chunker.RandomPolynomial()
 	if err != nil {
 		return err
@@ -547,13 +547,13 @@ func createConfig(s *Server) (err error) {
 	s.Config.ID = hex.EncodeToString(newID)
 	s.Config.Version = RepositoryVersion
 
-	debug.Log("Server.createConfig", "New config: %#v", s.Config)
+	debug.Log("Repository.createConfig", "New config: %#v", s.Config)
 
 	_, err = s.SaveJSONUnpacked(backend.Config, s.Config)
 	return err
 }
 
-func (s *Server) loadConfig(cfg *Config) error {
+func (s *Repository) loadConfig(cfg *Config) error {
 	err := s.LoadJSONUnpacked(backend.Config, nil, cfg)
 	if err != nil {
 		return err
@@ -572,7 +572,7 @@ func (s *Server) loadConfig(cfg *Config) error {
 
 // SearchKey finds a key with the supplied password, afterwards the config is
 // read and parsed.
-func (s *Server) SearchKey(password string) error {
+func (s *Repository) SearchKey(password string) error {
 	key, err := SearchKey(s, password)
 	if err != nil {
 		return err
@@ -585,7 +585,7 @@ func (s *Server) SearchKey(password string) error {
 
 // Init creates a new master key with the supplied password and initializes the
 // repository config.
-func (s *Server) Init(password string) error {
+func (s *Repository) Init(password string) error {
 	has, err := s.Test(backend.Config, "")
 	if err != nil {
 		return err
@@ -604,32 +604,32 @@ func (s *Server) Init(password string) error {
 	return createConfig(s)
 }
 
-func (s *Server) Decrypt(ciphertext []byte) ([]byte, error) {
+func (s *Repository) Decrypt(ciphertext []byte) ([]byte, error) {
 	if s.key == nil {
-		return nil, errors.New("key for server not set")
+		return nil, errors.New("key for repository not set")
 	}
 
 	return crypto.Decrypt(s.key, nil, ciphertext)
 }
 
-func (s *Server) Encrypt(ciphertext, plaintext []byte) ([]byte, error) {
+func (s *Repository) Encrypt(ciphertext, plaintext []byte) ([]byte, error) {
 	if s.key == nil {
-		return nil, errors.New("key for server not set")
+		return nil, errors.New("key for repository not set")
 	}
 
 	return crypto.Encrypt(s.key, ciphertext, plaintext)
 }
 
-func (s *Server) Key() *crypto.Key {
+func (s *Repository) Key() *crypto.Key {
 	return s.key
 }
 
-func (s *Server) KeyName() string {
+func (s *Repository) KeyName() string {
 	return s.keyName
 }
 
 // Count returns the number of blobs of a given type in the backend.
-func (s *Server) Count(t backend.Type) (n uint) {
+func (s *Repository) Count(t backend.Type) (n uint) {
 	for _ = range s.be.List(t, nil) {
 		n++
 	}
@@ -639,27 +639,27 @@ func (s *Server) Count(t backend.Type) (n uint) {
 
 // Proxy methods to backend
 
-func (s *Server) Get(t backend.Type, name string) (io.ReadCloser, error) {
+func (s *Repository) Get(t backend.Type, name string) (io.ReadCloser, error) {
 	return s.be.Get(t, name)
 }
 
-func (s *Server) List(t backend.Type, done <-chan struct{}) <-chan string {
+func (s *Repository) List(t backend.Type, done <-chan struct{}) <-chan string {
 	return s.be.List(t, done)
 }
 
-func (s *Server) Test(t backend.Type, name string) (bool, error) {
+func (s *Repository) Test(t backend.Type, name string) (bool, error) {
 	return s.be.Test(t, name)
 }
 
-func (s *Server) Remove(t backend.Type, name string) error {
+func (s *Repository) Remove(t backend.Type, name string) error {
 	return s.be.Remove(t, name)
 }
 
-func (s *Server) Close() error {
+func (s *Repository) Close() error {
 	return s.be.Close()
 }
 
-func (s *Server) Delete() error {
+func (s *Repository) Delete() error {
 	if b, ok := s.be.(backend.Deleter); ok {
 		return b.Delete()
 	}
@@ -667,6 +667,6 @@ func (s *Server) Delete() error {
 	return errors.New("Delete() called for backend that does not implement this method")
 }
 
-func (s *Server) Location() string {
+func (s *Repository) Location() string {
 	return s.be.Location()
 }
diff --git a/restorer.go b/restorer.go
index 26f605611..b11cd8916 100644
--- a/restorer.go
+++ b/restorer.go
@@ -14,7 +14,7 @@ import (
 
 // Restorer is used to restore a snapshot to a directory.
 type Restorer struct {
-	s  *repo.Server
+	s  *repo.Repository
 	sn *Snapshot
 
 	Error  func(dir string, node *Node, err error) error
@@ -24,7 +24,7 @@ type Restorer struct {
 var restorerAbortOnAllErrors = func(str string, node *Node, err error) error { return err }
 
 // NewRestorer creates a restorer preloaded with the content from the snapshot id.
-func NewRestorer(s *repo.Server, id backend.ID) (*Restorer, error) {
+func NewRestorer(s *repo.Repository, id backend.ID) (*Restorer, error) {
 	r := &Restorer{s: s, Error: restorerAbortOnAllErrors}
 
 	var err error
diff --git a/snapshot.go b/snapshot.go
index f32425f1f..68beafa25 100644
--- a/snapshot.go
+++ b/snapshot.go
@@ -50,7 +50,7 @@ func NewSnapshot(paths []string) (*Snapshot, error) {
 	return sn, nil
 }
 
-func LoadSnapshot(s *repo.Server, id backend.ID) (*Snapshot, error) {
+func LoadSnapshot(s *repo.Repository, id backend.ID) (*Snapshot, error) {
 	sn := &Snapshot{id: id}
 	err := s.LoadJSONUnpacked(backend.Snapshot, id, sn)
 	if err != nil {
diff --git a/test/backend.go b/test/backend.go
index 31b824155..a9193b1ff 100644
--- a/test/backend.go
+++ b/test/backend.go
@@ -17,7 +17,7 @@ var TestPassword = flag.String("test.password", "", `use this password for repos
 var TestCleanup = flag.Bool("test.cleanup", true, "clean up after running tests (remove local backend directory with all content)")
 var TestTempDir = flag.String("test.tempdir", "", "use this directory for temporary storage (default: system temp dir)")
 
-func SetupBackend(t testing.TB) *repo.Server {
+func SetupBackend(t testing.TB) *repo.Repository {
 	tempdir, err := ioutil.TempDir(*TestTempDir, "restic-test-")
 	OK(t, err)
 
@@ -29,12 +29,12 @@ func SetupBackend(t testing.TB) *repo.Server {
 	err = os.Setenv("RESTIC_CACHE", filepath.Join(tempdir, "cache"))
 	OK(t, err)
 
-	s := repo.NewServer(b)
+	s := repo.New(b)
 	OK(t, s.Init(*TestPassword))
 	return s
 }
 
-func TeardownBackend(t testing.TB, s *repo.Server) {
+func TeardownBackend(t testing.TB, s *repo.Repository) {
 	if !*TestCleanup {
 		l := s.Backend().(*local.Local)
 		t.Logf("leaving local backend at %s\n", l.Location())
@@ -44,7 +44,7 @@ func TeardownBackend(t testing.TB, s *repo.Server) {
 	OK(t, s.Delete())
 }
 
-func SnapshotDir(t testing.TB, server *repo.Server, path string, parent backend.ID) *restic.Snapshot {
+func SnapshotDir(t testing.TB, server *repo.Repository, path string, parent backend.ID) *restic.Snapshot {
 	arch := restic.NewArchiver(server)
 	sn, _, err := arch.Snapshot(nil, []string{path}, parent)
 	OK(t, err)
diff --git a/tree.go b/tree.go
index d43a119e7..c64e521f3 100644
--- a/tree.go
+++ b/tree.go
@@ -30,7 +30,7 @@ func (t Tree) String() string {
 	return fmt.Sprintf("Tree<%d nodes>", len(t.Nodes))
 }
 
-func LoadTree(s *repo.Server, id backend.ID) (*Tree, error) {
+func LoadTree(s *repo.Repository, id backend.ID) (*Tree, error) {
 	tree := &Tree{}
 	err := s.LoadJSONPack(pack.Tree, id, tree)
 	if err != nil {
diff --git a/walk.go b/walk.go
index a0f1566da..79a4cf176 100644
--- a/walk.go
+++ b/walk.go
@@ -16,7 +16,7 @@ type WalkTreeJob struct {
 	Tree *Tree
 }
 
-func walkTree(s *repo.Server, path string, treeID backend.ID, done chan struct{}, jobCh chan<- WalkTreeJob) {
+func walkTree(s *repo.Repository, path string, treeID backend.ID, done chan struct{}, jobCh chan<- WalkTreeJob) {
 	debug.Log("walkTree", "start on %q (%v)", path, treeID.Str())
 
 	t, err := LoadTree(s, treeID)
@@ -41,7 +41,7 @@ func walkTree(s *repo.Server, path string, treeID backend.ID, done chan struct{}
 // WalkTree walks the tree specified by id recursively and sends a job for each
 // file and directory it finds. When the channel done is closed, processing
 // stops.
-func WalkTree(server *repo.Server, id backend.ID, done chan struct{}, jobCh chan<- WalkTreeJob) {
+func WalkTree(server *repo.Repository, id backend.ID, done chan struct{}, jobCh chan<- WalkTreeJob) {
 	debug.Log("WalkTree", "start on %v", id.Str())
 	walkTree(server, "", id, done, jobCh)
 	close(jobCh)