diff --git a/configs/cyclegan_cityscapes.yaml b/configs/cyclegan_cityscapes.yaml
index fd48f9f5905967e11bf4db336a4dbef23d0cd49f..cbd1b84c1373045fef07d17b42a2bf8e45ea643b 100644
--- a/configs/cyclegan_cityscapes.yaml
+++ b/configs/cyclegan_cityscapes.yaml
@@ -26,7 +26,7 @@ model:
 
 dataset:
   train:
-    name: UnalignedDataset
+    name: UnpairedDataset
     dataroot: data/cityscapes
     phase: train
     max_dataset_size: inf
diff --git a/configs/cyclegan_horse2zebra.yaml b/configs/cyclegan_horse2zebra.yaml
index 7cd27e3049a7c6df38b72831cc3ff6f412ff6005..72c7cf6ccf3a9b058914498a25c8165400d3cb4e 100644
--- a/configs/cyclegan_horse2zebra.yaml
+++ b/configs/cyclegan_horse2zebra.yaml
@@ -26,7 +26,7 @@ model:
 
 dataset:
   train:
-    name: UnalignedDataset
+    name: UnpairedDataset
     dataroot: data/horse2zebra
     phase: train
     max_dataset_size: inf
diff --git a/configs/pix2pix_cityscapes.yaml b/configs/pix2pix_cityscapes.yaml
index 3131d0b078c972c8892f28dd8a27ffb45e1ac8a1..b074fddf678d19f5fd4de2d7084ab7b0ad24be32 100644
--- a/configs/pix2pix_cityscapes.yaml
+++ b/configs/pix2pix_cityscapes.yaml
@@ -23,7 +23,7 @@ model:
 
 dataset:
   train:
-    name: AlignedDataset
+    name: PairedDataset
     dataroot: data/cityscapes
     phase: train
     max_dataset_size: inf
@@ -38,7 +38,7 @@ dataset:
       preprocess: resize_and_crop
       no_flip: False
   test:
-    name: AlignedDataset
+    name: PairedDataset
     dataroot: data/cityscapes/
     phase: test
     max_dataset_size: inf
diff --git a/configs/pix2pix_cityscapes_2gpus.yaml b/configs/pix2pix_cityscapes_2gpus.yaml
index 5b785c16b9a05b2874c54937728fa794bd3cb494..387f16bd2de43cd150a852b238057850607911be 100644
--- a/configs/pix2pix_cityscapes_2gpus.yaml
+++ b/configs/pix2pix_cityscapes_2gpus.yaml
@@ -23,7 +23,7 @@ model:
 
 dataset:
   train:
-    name: AlignedDataset
+    name: PairedDataset
     dataroot: data/cityscapes
     phase: train
     max_dataset_size: inf
@@ -38,7 +38,7 @@ dataset:
       preprocess: resize_and_crop
       no_flip: False
   test:
-    name: AlignedDataset
+    name: PairedDataset
     dataroot: data/cityscapes/
     phase: test
     max_dataset_size: inf
diff --git a/ppgan/datasets/__init__.py b/ppgan/datasets/__init__.py
index 178cb4d9709b0b8c0f68df9170be80692593092e..9b807e9be0c83dda6415ebf01418cc77b8f463ba 100644
--- a/ppgan/datasets/__init__.py
+++ b/ppgan/datasets/__init__.py
@@ -1,3 +1,3 @@
-from .unaligned_dataset import UnalignedDataset
+from .unpaired_dataset import UnpairedDataset
 from .single_dataset import SingleDataset
-from .aligned_dataset import AlignedDataset
+from .paired_dataset import PairedDataset
diff --git a/ppgan/datasets/aligned_dataset.py b/ppgan/datasets/paired_dataset.py
similarity index 91%
rename from ppgan/datasets/aligned_dataset.py
rename to ppgan/datasets/paired_dataset.py
index 8c8f8ce4e62abf6b51cf652c5be0db28d54c805e..368f8371178ab771d3139103992a97abc3ee0fe8 100644
--- a/ppgan/datasets/aligned_dataset.py
+++ b/ppgan/datasets/paired_dataset.py
@@ -8,19 +8,19 @@ from .builder import DATASETS
 
 
 @DATASETS.register()
-class AlignedDataset(BaseDataset):
+class PairedDataset(BaseDataset):
     """A dataset class for paired image dataset.
     """
 
-    def __init__(self, opt):
+    def __init__(self, cfg):
         """Initialize this dataset class.
 
         Args:
             cfg (dict) -- stores all the experiment flags
         """
-        BaseDataset.__init__(self, opt)
-        self.dir_AB = os.path.join(opt.dataroot, opt.phase)  # get the image directory
-        self.AB_paths = sorted(make_dataset(self.dir_AB, opt.max_dataset_size))  # get image paths
+        BaseDataset.__init__(self, cfg)
+        self.dir_AB = os.path.join(cfg.dataroot, cfg.phase)  # get the image directory
+        self.AB_paths = sorted(make_dataset(self.dir_AB, cfg.max_dataset_size))  # get image paths
         assert(self.cfg.transform.load_size >= self.cfg.transform.crop_size)   # crop_size should be smaller than the size of loaded image
         self.input_nc = self.cfg.output_nc if self.cfg.direction == 'BtoA' else self.cfg.input_nc
         self.output_nc = self.cfg.input_nc if self.cfg.direction == 'BtoA' else self.cfg.output_nc
diff --git a/ppgan/datasets/unaligned_dataset.py b/ppgan/datasets/unpaired_dataset.py
similarity index 98%
rename from ppgan/datasets/unaligned_dataset.py
rename to ppgan/datasets/unpaired_dataset.py
index da673a07216cf6ae827b5431d6fd42f86ca1a0dc..5cabc5391b84e9f6aa55e0925d4202c7b3d09418 100644
--- a/ppgan/datasets/unaligned_dataset.py
+++ b/ppgan/datasets/unpaired_dataset.py
@@ -8,7 +8,7 @@ from .builder import DATASETS
 
 
 @DATASETS.register()
-class UnalignedDataset(BaseDataset):
+class UnpairedDataset(BaseDataset):
     """
     """