diff --git a/README.md b/README.md
index 30e1d5719d1c88590191141360dc06f03f8fbc6f..bb2b1d1d10693dcd9d11d6f4fdc9d790660d1242 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ PaddleHub旨在为PaddlePaddle提供一个简明易用的预训练模型管理
 # 安装
 paddle hub直接通过pip进行安装（python3以上），使用如下命令来安装paddle hub
 ```
-pip install paddle_hub
+pip install paddlehub
 ```
 # 快速体验
 通过下面的命令，来体验下paddle hub的魅力
diff --git a/demo/ernie-classification/finetune_with_hub.py b/demo/ernie-classification/finetune_with_hub.py
index ef291a4865b9b8f1e2d7c7c53a4453afa4c4ea9a..0e82da176ec3c5a3722b767e5f6043e47c872cfe 100644
--- a/demo/ernie-classification/finetune_with_hub.py
+++ b/demo/ernie-classification/finetune_with_hub.py
@@ -24,7 +24,7 @@ import numpy as np
 
 import paddle
 import paddle.fluid as fluid
-import paddle_hub as hub
+import paddlehub as hub
 
 # yapf: disable
 parser = argparse.ArgumentParser(__doc__)
diff --git a/demo/image-classification/create_module.py b/demo/image-classification/create_module.py
index 652ce7734ce1ab11c01cbaadcde45d37dd9ed5e4..3015066b9072f28268be2831a487e70a66f1e2e6 100644
--- a/demo/image-classification/create_module.py
+++ b/demo/image-classification/create_module.py
@@ -1,13 +1,16 @@
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
+
 import os
 import functools
 import argparse
+
 import paddle
 import paddle.fluid as fluid
+
 import nets
-import paddle_hub as hub
+import paddlehub as hub
 import processor
 from utility import add_arguments, print_arguments
 parser = argparse.ArgumentParser(description=__doc__)
diff --git a/demo/image-classification/infer.sh b/demo/image-classification/infer.sh
index 47b1486f6201197685ea3f1795979f4f65a45007..6aff1d777eeb7cb82696e16ab5acea73ba34a289 100644
--- a/demo/image-classification/infer.sh
+++ b/demo/image-classification/infer.sh
@@ -1 +1 @@
-python ../../paddle_hub/commands/hub.py run hub_module_ResNet50/ --signature classification --config resources/test/test.yml  --dataset resources/test/test.csv
+python ../../paddlehub/commands/hub.py run hub_module_ResNet50/ --signature classification --config resources/test/test.yml  --dataset resources/test/test.csv
diff --git a/demo/image-classification/processor.py b/demo/image-classification/processor.py
index b5faf1e0940a3259e41387cf8327fb779c98c26e..66ff7e44c3cd6fa016b29e5161badd5f586dd71f 100644
--- a/demo/image-classification/processor.py
+++ b/demo/image-classification/processor.py
@@ -1,10 +1,12 @@
+import os
+
 import paddle
-import paddle_hub as hub
 import numpy as np
-import os
-from paddle_hub import BaseProcessor
 from PIL import Image
 
+from paddlehub import BaseProcessor
+import paddlehub as hub
+
 DATA_DIM = 224
 img_mean = np.array([0.485, 0.456, 0.406]).reshape((3, 1, 1))
 img_std = np.array([0.229, 0.224, 0.225]).reshape((3, 1, 1))
diff --git a/demo/image-classification/retrain.py b/demo/image-classification/retrain.py
index 8f07a6f724f72349ebf3116560439e6df272ef1e..77350776878ad0a7fcc82b8eb3809839344c5ee0 100644
--- a/demo/image-classification/retrain.py
+++ b/demo/image-classification/retrain.py
@@ -1,10 +1,11 @@
-import paddle_hub as hub
 import paddle
 import paddle.fluid as fluid
 
+import paddlehub as hub
+
 
 def train():
-    resnet_module = hub.Module(name="resnet50_imagenet")
+    resnet_module = hub.Module(module_dir="hub_module_ResNet50")
     input_dict, output_dict, program = resnet_module.context(
         sign_name="feature_map", trainable=True)
     dataset = hub.dataset.Flowers()
diff --git a/demo/lac/create_module.py b/demo/lac/create_module.py
index 564f7e98d5fd542bf9b4b98e12ff390cdd0654b7..a7710e37df261171931da8d18447bb4f26a482f3 100644
--- a/demo/lac/create_module.py
+++ b/demo/lac/create_module.py
@@ -2,7 +2,7 @@ import numpy as np
 import paddle
 import paddle.fluid as fluid
 import reader
-import paddle_hub as hub
+import paddlehub as hub
 import processor
 import os
 from network import lex_net
diff --git a/demo/lac/infer.sh b/demo/lac/infer.sh
index 6416781a616122d4171e64fc8184380a00d19022..d76a7398dff58f175b3104a7c741fcd45be77931 100644
--- a/demo/lac/infer.sh
+++ b/demo/lac/infer.sh
@@ -1 +1 @@
-python ../../paddle_hub/commands/hub.py run hub_module_lac/ --signature lexical_analysis --config resources/test/test.yml  --input_file resources/test/test.csv
+python ../../paddlehub/commands/hub.py run hub_module_lac/ --signature lexical_analysis --config resources/test/test.yml  --input_file resources/test/test.csv
diff --git a/demo/lac/infer_by_code.py b/demo/lac/infer_by_code.py
index a1542860228515e59668f3cee5fa0fdf158baa7c..2c8a66debe336552c1d630b8eaa1a08c3a3e1da2 100644
--- a/demo/lac/infer_by_code.py
+++ b/demo/lac/infer_by_code.py
@@ -1,5 +1,5 @@
 import os
-import paddle_hub as hub
+import paddlehub as hub
 
 
 def infer_with_input_text():
diff --git a/demo/lac/processor.py b/demo/lac/processor.py
index e162908a251b78168008a922cc2322e0819e478a..16530f48552071fef201336adf7856981787f569 100644
--- a/demo/lac/processor.py
+++ b/demo/lac/processor.py
@@ -1,10 +1,10 @@
 import paddle
 import paddle.fluid as fluid
-import paddle_hub as hub
+import paddlehub as hub
 import numpy as np
 import os
 import io
-from paddle_hub import BaseProcessor
+from paddlehub import BaseProcessor
 
 
 class Processor(BaseProcessor):
diff --git a/demo/senta/create_module.py b/demo/senta/create_module.py
index 043731b24fc74238a231034862697056cf33171d..cc500410ed119ddf60449d0ca0cb26b8f8e6ae46 100644
--- a/demo/senta/create_module.py
+++ b/demo/senta/create_module.py
@@ -3,7 +3,7 @@ import paddle.fluid as fluid
 import processor
 import numpy as np
 import nets
-import paddle_hub as hub
+import paddlehub as hub
 
 
 def load_vocab(file_path):
diff --git a/demo/senta/infer.sh b/demo/senta/infer.sh
index f71ba31263d175aafd835d0dd6681fd695b73d60..2cba37926f8526f8371a0b068c3bcc6505d8b67b 100644
--- a/demo/senta/infer.sh
+++ b/demo/senta/infer.sh
@@ -1 +1 @@
-python ../../paddle_hub/commands/hub.py run hub_module_senta/ --signature sentiment_classify --config resources/test/test.yml  --dataset resources/test/test.csv
+python ../../paddlehub/commands/hub.py run hub_module_senta/ --signature sentiment_classify --config resources/test/test.yml  --dataset resources/test/test.csv
diff --git a/demo/senta/infer_by_code.py b/demo/senta/infer_by_code.py
index d814e4fbbb6ee7aeb26875cfd3dfacc1f33f4e13..36b9fad6c064ac07dfcc09c2b01a8ee8e2303cac 100644
--- a/demo/senta/infer_by_code.py
+++ b/demo/senta/infer_by_code.py
@@ -1,5 +1,5 @@
 import os
-import paddle_hub as hub
+import paddlehub as hub
 
 
 def infer_with_input_text():
diff --git a/demo/senta/processor.py b/demo/senta/processor.py
index 5c523138b95d35fc559622e0b742057d2af00220..4bb0e00ebb6c8b899d4f7d462883cf3ac358fea1 100644
--- a/demo/senta/processor.py
+++ b/demo/senta/processor.py
@@ -5,7 +5,7 @@ import paddle
 import paddle.fluid as fluid
 import numpy as np
 
-import paddle_hub as hub
+import paddlehub as hub
 
 
 def load_vocab(file_path):
diff --git a/demo/ssd/create_module.py b/demo/ssd/create_module.py
index 6864c4700c36cf88ead48fad0c1a2bc6fa227e1e..c35c6b1d6192b34e11acf45d6c84e6cb943d36a1 100644
--- a/demo/ssd/create_module.py
+++ b/demo/ssd/create_module.py
@@ -1,7 +1,7 @@
 import os
 import numpy as np
 import processor
-import paddle_hub as hub
+import paddlehub as hub
 import paddle
 import paddle.fluid as fluid
 from mobilenet_ssd import mobile_net
diff --git a/demo/ssd/infer.sh b/demo/ssd/infer.sh
index 7ad3a71dda005c9b4e34a6a3a41243513b0c63ec..02a1a0191f46dfdec00098cbb7c5d493c200cb20 100644
--- a/demo/ssd/infer.sh
+++ b/demo/ssd/infer.sh
@@ -1 +1 @@
-python ../../paddle_hub/commands/hub.py run hub_module_ssd/ --signature object_detection --config resources/test/test.yml  --dataset resources/test/test.csv
+python ../../paddlehub/commands/hub.py run hub_module_ssd/ --signature object_detection --config resources/test/test.yml  --dataset resources/test/test.csv
diff --git a/demo/ssd/infer_by_code.py b/demo/ssd/infer_by_code.py
index 063e7a873682acff640a9ac5fbf9f03cc66b6edc..0dc6cf3f288b116ba1c68ac7ad9f787aca4eed6c 100644
--- a/demo/ssd/infer_by_code.py
+++ b/demo/ssd/infer_by_code.py
@@ -1,5 +1,5 @@
 import os
-import paddle_hub as hub
+import paddlehub as hub
 
 
 def infer_with_input_text():
diff --git a/demo/ssd/processor.py b/demo/ssd/processor.py
index cd88b633d04c72f952240b0201dffc20a3c9a703..4b9aea86d77fd1aa7330394fc9d96450ddaa252a 100644
--- a/demo/ssd/processor.py
+++ b/demo/ssd/processor.py
@@ -1,8 +1,8 @@
 import paddle
-import paddle_hub as hub
+import paddlehub as hub
 import numpy as np
 import os
-from paddle_hub import BaseProcessor
+from paddlehub import BaseProcessor
 from PIL import Image
 from PIL import ImageDraw
 from PIL import ImageFont
diff --git a/docs/transfer_learning_turtorial.md b/docs/transfer_learning_turtorial.md
index 5c36c26cd5ccd9733d6b012d91715417783b9457..ee4fb16ef41d7c1a4129dd44bee87393f1bd0c3d 100644
--- a/docs/transfer_learning_turtorial.md
+++ b/docs/transfer_learning_turtorial.md
@@ -20,7 +20,7 @@ http://ftp.cs.wisc.edu/machine-learning/shavlik-group/torrey.handbook09.pdf
 ## CV教程
 以猫狗分类为例子，我们可以快速的使用一个通过ImageNet训练过的ResNet进行finetune
 ```python
-import paddle_hub as hub
+import paddlehub as hub
 import paddle
 import paddle.fluid as fluid
 
diff --git a/paddle_hub/__init__.py b/paddlehub/__init__.py
similarity index 100%
rename from paddle_hub/__init__.py
rename to paddlehub/__init__.py
diff --git a/paddle_hub/commands/__init__.py b/paddlehub/commands/__init__.py
similarity index 100%
rename from paddle_hub/commands/__init__.py
rename to paddlehub/commands/__init__.py
diff --git a/paddle_hub/commands/base_command.py b/paddlehub/commands/base_command.py
similarity index 96%
rename from paddle_hub/commands/base_command.py
rename to paddlehub/commands/base_command.py
index 8d423a8f522e693b883aec92d14f4a29d6d9b044..f7eaddaddaf6f79adfd5e7bfa09e654b227a1c25 100644
--- a/paddle_hub/commands/base_command.py
+++ b/paddlehub/commands/base_command.py
@@ -15,9 +15,11 @@
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
-from paddle_hub.common.arg_helper import add_argument, print_arguments
+
 import argparse
 
+from paddlehub.common.arg_helper import add_argument, print_arguments
+
 ENTRY = "hub"
 
 
diff --git a/paddle_hub/commands/download.py b/paddlehub/commands/download.py
similarity index 91%
rename from paddle_hub/commands/download.py
rename to paddlehub/commands/download.py
index ff693d30c621553afb84873043edd6519b628203..0b935a3aaf64b77d0d27cca875232c0dba0f9e71 100644
--- a/paddle_hub/commands/download.py
+++ b/paddlehub/commands/download.py
@@ -15,13 +15,15 @@
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
-from paddle_hub.common.logger import logger
-from paddle_hub.commands.base_command import BaseCommand, ENTRY
-from paddle_hub.common import utils
-from paddle_hub.common.downloader import default_downloader
-from paddle_hub.common.hub_server import default_hub_server
+
 import argparse
 
+from paddlehub.common.logger import logger
+from paddlehub.common import utils
+from paddlehub.common.downloader import default_downloader
+from paddlehub.common.hub_server import default_hub_server
+from paddlehub.commands.base_command import BaseCommand, ENTRY
+
 
 class DownloadCommand(BaseCommand):
     name = "download"
diff --git a/paddle_hub/commands/help.py b/paddlehub/commands/help.py
similarity index 96%
rename from paddle_hub/commands/help.py
rename to paddlehub/commands/help.py
index 11324f95278a3ce0e9ec30b21d940ae53c046dae..9534a95a186fabbf15b8415a5fc66488bcd5f74c 100644
--- a/paddle_hub/commands/help.py
+++ b/paddlehub/commands/help.py
@@ -15,7 +15,8 @@
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
-from paddle_hub.commands.base_command import BaseCommand
+
+from paddlehub.commands.base_command import BaseCommand
 
 
 class HelpCommand(BaseCommand):
diff --git a/paddle_hub/commands/hub.py b/paddlehub/commands/hub.py
similarity index 83%
rename from paddle_hub/commands/hub.py
rename to paddlehub/commands/hub.py
index 40bd7451a88625248a4b80ec7b66edc31ab63ddc..f2ce422ac8a65095810e87db661ab35311f6789f 100644
--- a/paddle_hub/commands/hub.py
+++ b/paddlehub/commands/hub.py
@@ -15,15 +15,17 @@
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
-from paddle_hub.common.logger import logger
-from paddle_hub.commands.base_command import BaseCommand
-from paddle_hub.commands import show
-from paddle_hub.commands import help
-from paddle_hub.commands import version
-from paddle_hub.commands import run
-from paddle_hub.commands import download
+
 import sys
 
+from paddlehub.common.logger import logger
+from paddlehub.commands.base_command import BaseCommand
+from paddlehub.commands import show
+from paddlehub.commands import help
+from paddlehub.commands import version
+from paddlehub.commands import run
+from paddlehub.commands import download
+
 
 class HubCommand(BaseCommand):
     name = "hub"
diff --git a/paddle_hub/commands/install.py b/paddlehub/commands/install.py
similarity index 90%
rename from paddle_hub/commands/install.py
rename to paddlehub/commands/install.py
index eb3fd9aa1bb3d55ff886c655b37f6870dd8fecad..1ce0b6ad21d888dd73c619d16eb11d07a448558d 100644
--- a/paddle_hub/commands/install.py
+++ b/paddlehub/commands/install.py
@@ -17,10 +17,10 @@ from __future__ import print_function
 
 import argparse
 
-from paddle_hub.common.logger import logger
-from paddle_hub.commands.base_command import BaseCommand, ENTRY
-from paddle_hub.common import utils
-from paddle_hub.module.manager import default_module_manager
+from paddlehub.common.logger import logger
+from paddlehub.common import utils
+from paddlehub.module.manager import default_module_manager
+from paddlehub.commands.base_command import BaseCommand, ENTRY
 
 
 class InstallCommand(BaseCommand):
diff --git a/paddle_hub/commands/list.py b/paddlehub/commands/list.py
similarity index 84%
rename from paddle_hub/commands/list.py
rename to paddlehub/commands/list.py
index 1b8d692b9dcea95d4b259bc83ed2d5e2fe843af7..b7d68e99fe91c5965f3dfca81c7ea100a6af4afd 100644
--- a/paddle_hub/commands/list.py
+++ b/paddlehub/commands/list.py
@@ -16,11 +16,11 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from paddle_hub.common.logger import logger
-from paddle_hub.commands.base_command import BaseCommand
-from paddle_hub.common import utils
-from paddle_hub.common.downloader import default_downloader
-from paddle_hub.module.manager import default_module_manager
+from paddlehub.common.logger import logger
+from paddlehub.common import utils
+from paddlehub.common.downloader import default_downloader
+from paddlehub.module.manager import default_module_manager
+from paddlehub.commands.base_command import BaseCommand
 
 
 class ListCommand(BaseCommand):
diff --git a/paddle_hub/commands/run.py b/paddlehub/commands/run.py
similarity index 94%
rename from paddle_hub/commands/run.py
rename to paddlehub/commands/run.py
index 3fe8f1a2879726d6e108680df05489e352a5bba6..1b6249bf82e211625b464a88d8456750e659955d 100644
--- a/paddle_hub/commands/run.py
+++ b/paddlehub/commands/run.py
@@ -16,17 +16,17 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from paddle_hub.common.logger import logger
-from paddle_hub.commands.base_command import BaseCommand, ENTRY
-from paddle_hub.io.reader import csv_reader, yaml_reader
-from paddle_hub.module.manager import default_module_manager
-from paddle_hub.common import utils
-from paddle_hub.common.arg_helper import add_argument, print_arguments
-
-import paddle_hub as hub
 import argparse
 import os
 
+from paddlehub.common.logger import logger
+from paddlehub.commands.base_command import BaseCommand, ENTRY
+from paddlehub.io.reader import csv_reader, yaml_reader
+from paddlehub.module.manager import default_module_manager
+from paddlehub.common import utils
+from paddlehub.common.arg_helper import add_argument, print_arguments
+import paddlehub as hub
+
 
 class RunCommand(BaseCommand):
     name = "run"
diff --git a/paddle_hub/commands/search.py b/paddlehub/commands/search.py
similarity index 84%
rename from paddle_hub/commands/search.py
rename to paddlehub/commands/search.py
index 801ef132b5b5e057942f355180b26c9975965a5c..588cb1144ce7541f36ab83e7c45bdfdc13a32585 100644
--- a/paddle_hub/commands/search.py
+++ b/paddlehub/commands/search.py
@@ -15,12 +15,14 @@
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
-from paddle_hub.common.logger import logger
-from paddle_hub.commands.base_command import BaseCommand, ENTRY
-from paddle_hub.common import utils
-from paddle_hub.common.hub_server import default_hub_server
+
 import argparse
 
+from paddlehub.common.logger import logger
+from paddlehub.common import utils
+from paddlehub.common.hub_server import default_hub_server
+from paddlehub.commands.base_command import BaseCommand, ENTRY
+
 
 class SearchCommand(BaseCommand):
     name = "search"
@@ -44,7 +46,8 @@ class SearchCommand(BaseCommand):
         module_name = argv[0]
         module_list = default_hub_server.search_module(module_name)
         text = "\n"
-        text += "  %-20s\t\t%s\n" % ("ModuleName", "ModuleVersion")
+        text += color_bold_text(
+            "red", "  %-20s\t\t%s\n" % ("ModuleName", "ModuleVersion"))
         text += "  %-20s\t\t%s\n" % ("--", "--")
         for module_name, module_version in module_list:
             text += "  %-20s\t\t%s\n" % (module_name, module_version)
diff --git a/paddle_hub/commands/show.py b/paddlehub/commands/show.py
similarity index 91%
rename from paddle_hub/commands/show.py
rename to paddlehub/commands/show.py
index 58ed0bfda8cb21538ffd0b059b7669ef39c16f6f..ed15b563727e8e23e028d11dee827be61aefda0b 100644
--- a/paddle_hub/commands/show.py
+++ b/paddlehub/commands/show.py
@@ -19,11 +19,11 @@ from __future__ import print_function
 import os
 import argparse
 
-from paddle_hub.common.logger import logger
-from paddle_hub.commands.base_command import BaseCommand, ENTRY
-from paddle_hub.module.manager import default_module_manager
-from paddle_hub.module.module import Module
-from paddle_hub.io.reader import yaml_reader
+from paddlehub.common.logger import logger
+from paddlehub.commands.base_command import BaseCommand, ENTRY
+from paddlehub.module.manager import default_module_manager
+from paddlehub.module.module import Module
+from paddlehub.io.reader import yaml_reader
 
 
 class ShowCommand(BaseCommand):
diff --git a/paddle_hub/commands/uninstall.py b/paddlehub/commands/uninstall.py
similarity index 88%
rename from paddle_hub/commands/uninstall.py
rename to paddlehub/commands/uninstall.py
index e89d971ace2fd697df0b03a97b9228aad9fc3545..b9652d2519133ad751f2eb646331450a1801adcb 100644
--- a/paddle_hub/commands/uninstall.py
+++ b/paddlehub/commands/uninstall.py
@@ -18,10 +18,10 @@ from __future__ import print_function
 
 import argparse
 
-from paddle_hub.common.logger import logger
-from paddle_hub.commands.base_command import BaseCommand, ENTRY
-from paddle_hub.common import utils
-from paddle_hub.module.manager import default_module_manager
+from paddlehub.common.logger import logger
+from paddlehub.common import utils
+from paddlehub.module.manager import default_module_manager
+from paddlehub.commands.base_command import BaseCommand, ENTRY
 
 
 class UninstallCommand(BaseCommand):
diff --git a/paddle_hub/commands/version.py b/paddlehub/commands/version.py
similarity index 89%
rename from paddle_hub/commands/version.py
rename to paddlehub/commands/version.py
index d840b4074a9d48c842ccfd891fdaa20482c65b47..b0c1696cb944fdd7162934c286995ef5522629ae 100644
--- a/paddle_hub/commands/version.py
+++ b/paddlehub/commands/version.py
@@ -16,9 +16,9 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-from paddle_hub.common.logger import logger
-from paddle_hub.commands.base_command import BaseCommand
-from paddle_hub import version
+from paddlehub.common.logger import logger
+from paddlehub import version
+from paddlehub.commands.base_command import BaseCommand
 
 
 class VersionCommand(BaseCommand):
diff --git a/paddle_hub/common/__init__.py b/paddlehub/common/__init__.py
similarity index 100%
rename from paddle_hub/common/__init__.py
rename to paddlehub/common/__init__.py
diff --git a/paddle_hub/common/arg_helper.py b/paddlehub/common/arg_helper.py
similarity index 96%
rename from paddle_hub/common/arg_helper.py
rename to paddlehub/common/arg_helper.py
index a23b15e9216d2996590f7a8e46a93be1094e45bc..c5cff83560f71f806d53d19be19759188fa0002c 100644
--- a/paddle_hub/common/arg_helper.py
+++ b/paddlehub/common/arg_helper.py
@@ -15,10 +15,12 @@
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
-from paddle_hub.common.logger import logger
+
 import six
 import distutils.util
 
+from paddlehub.common.logger import logger
+
 
 def add_argument(argument, type, default, help, argparser, **kwargs):
     type = distutils.util.strtobool if type == bool else type
diff --git a/paddle_hub/common/dir.py b/paddlehub/common/dir.py
similarity index 100%
rename from paddle_hub/common/dir.py
rename to paddlehub/common/dir.py
diff --git a/paddle_hub/common/downloader.py b/paddlehub/common/downloader.py
similarity index 97%
rename from paddle_hub/common/downloader.py
rename to paddlehub/common/downloader.py
index fcd899df79f2719e0a732cb05d79eea45a4eb8ad..b79ae865fe4135297734d9c3ae2d62dbbadbd402 100644
--- a/paddle_hub/common/downloader.py
+++ b/paddlehub/common/downloader.py
@@ -26,9 +26,9 @@ import requests
 import tempfile
 import tarfile
 
-from paddle_hub.common import utils
-from paddle_hub.common.logger import logger
-from paddle_hub.io.reader import csv_reader
+from paddlehub.common import utils
+from paddlehub.common.logger import logger
+from paddlehub.io.reader import csv_reader
 
 __all__ = ['Downloader']
 FLUSH_INTERVAL = 0.1
diff --git a/paddle_hub/common/hub_server.py b/paddlehub/common/hub_server.py
similarity index 97%
rename from paddle_hub/common/hub_server.py
rename to paddlehub/common/hub_server.py
index cca2d97a387b90d5eb4fd244c9a6c470d4a42c43..6e5ebe4efb4ed31ddc8158f164c22d626a670978 100644
--- a/paddle_hub/common/hub_server.py
+++ b/paddlehub/common/hub_server.py
@@ -15,12 +15,14 @@
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
-from paddle_hub.common import utils
-from paddle_hub.common.downloader import default_downloader
-from paddle_hub.io.reader import csv_reader
+
 import os
 import time
-import paddle_hub as hub
+
+from paddlehub.common import utils
+from paddlehub.common.downloader import default_downloader
+from paddlehub.io.reader import csv_reader
+import paddlehub as hub
 
 MODULE_LIST_FILE = "module_list_file.csv"
 MODEL_LIST_FILE = "model_list_file.csv"
diff --git a/paddle_hub/common/logger.py b/paddlehub/common/logger.py
similarity index 99%
rename from paddle_hub/common/logger.py
rename to paddlehub/common/logger.py
index 61e3c8e8b7de19bd1cef2653497fa7d73ed7fcd6..d04913a8af4c8bc73098e078171b5e5a13a2f858 100644
--- a/paddle_hub/common/logger.py
+++ b/paddlehub/common/logger.py
@@ -15,6 +15,7 @@
 from __future__ import print_function
 from __future__ import division
 from __future__ import print_function
+
 import logging
 import math
 
diff --git a/paddle_hub/common/paddle_helper.py b/paddlehub/common/paddle_helper.py
similarity index 98%
rename from paddle_hub/common/paddle_helper.py
rename to paddlehub/common/paddle_helper.py
index 6cf386f6f1d0b5a786600891e689a6b31a7afde0..4fe1c97b828004500fd7180b738848cc6e73e1dc 100644
--- a/paddle_hub/common/paddle_helper.py
+++ b/paddlehub/common/paddle_helper.py
@@ -15,13 +15,15 @@
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
-from ..module import module_desc_pb2
-from .utils import from_pyobj_to_module_attr, from_module_attr_to_pyobj
-from .logger import logger
+
 import paddle
 import paddle.fluid as fluid
 import copy
 
+from paddlehub.module import module_desc_pb2
+from paddlehub.common.utils import from_pyobj_to_module_attr, from_module_attr_to_pyobj
+from paddlehub.common.logger import logger
+
 
 def get_variable_info(var):
     assert isinstance(
diff --git a/paddle_hub/common/utils.py b/paddlehub/common/utils.py
similarity index 98%
rename from paddle_hub/common/utils.py
rename to paddlehub/common/utils.py
index 80ed69fb796a167f6ba09020722e6000fb454bcc..7ff79f09f5acce7aa1f774329797e9b7dcc5dabf 100644
--- a/paddle_hub/common/utils.py
+++ b/paddlehub/common/utils.py
@@ -12,18 +12,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# coding=utf-8
-
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
-from paddle_hub.module import module_desc_pb2
-from paddle_hub.common.logger import logger
-import paddle
-import paddle.fluid as fluid
+
 import os
 import hashlib
 
+import paddle
+import paddle.fluid as fluid
+
+from paddlehub.module import module_desc_pb2
+from paddlehub.common.logger import logger
+
 
 def to_list(input):
     if not isinstance(input, list):
diff --git a/paddle_hub/dataset/__init__.py b/paddlehub/dataset/__init__.py
similarity index 100%
rename from paddle_hub/dataset/__init__.py
rename to paddlehub/dataset/__init__.py
diff --git a/paddle_hub/dataset/base_cv_dataset.py b/paddlehub/dataset/base_cv_dataset.py
similarity index 96%
rename from paddle_hub/dataset/base_cv_dataset.py
rename to paddlehub/dataset/base_cv_dataset.py
index a0f811c90b5ba34b3a8f2dbefd5b84237b0dcb9d..07b050c700490f8c5bc2a226d5091a804df3d561 100644
--- a/paddle_hub/dataset/base_cv_dataset.py
+++ b/paddlehub/dataset/base_cv_dataset.py
@@ -18,8 +18,8 @@ from __future__ import print_function
 
 import os
 
-import paddle_hub as hub
-from paddle_hub.common.downloader import default_downloader
+import paddlehub as hub
+from paddlehub.common.downloader import default_downloader
 
 
 class ImageClassificationDataset:
diff --git a/paddle_hub/dataset/chnsenticorp.py b/paddlehub/dataset/chnsenticorp.py
similarity index 93%
rename from paddle_hub/dataset/chnsenticorp.py
rename to paddlehub/dataset/chnsenticorp.py
index b81c8de2a04458acb6cd41a0263276892a730415..3cb879dda55e7ad3c86baf8bfa50876fec8a6686 100644
--- a/paddle_hub/dataset/chnsenticorp.py
+++ b/paddlehub/dataset/chnsenticorp.py
@@ -12,15 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from paddle_hub.common.downloader import default_downloader
-from paddle_hub.common.dir import DATA_HOME
-
+from collections import namedtuple
 import os
 import csv
 
-from paddle_hub.dataset import InputExample
-from paddle_hub.dataset import HubDataset
-from collections import namedtuple
+from paddlehub.dataset import InputExample
+from paddlehub.dataset import HubDataset
+from paddlehub.common.downloader import default_downloader
+from paddlehub.common.dir import DATA_HOME
 
 DATA_URL = "https://paddlehub-dataset.bj.bcebos.com/chnsenticorp_data.tar.gz"
 
diff --git a/paddle_hub/dataset/dataset.py b/paddlehub/dataset/dataset.py
similarity index 100%
rename from paddle_hub/dataset/dataset.py
rename to paddlehub/dataset/dataset.py
diff --git a/paddle_hub/dataset/dogcat.py b/paddlehub/dataset/dogcat.py
similarity index 92%
rename from paddle_hub/dataset/dogcat.py
rename to paddlehub/dataset/dogcat.py
index 7ceb9e900459dd7612272f0c16c5d793972a5d32..3bdca560c19142eac6f93679b1fe635e693f7e1d 100644
--- a/paddle_hub/dataset/dogcat.py
+++ b/paddlehub/dataset/dogcat.py
@@ -18,8 +18,8 @@ from __future__ import print_function
 
 import os
 
-import paddle_hub as hub
-from paddle_hub.dataset.base_cv_dataset import ImageClassificationDataset
+import paddlehub as hub
+from paddlehub.dataset.base_cv_dataset import ImageClassificationDataset
 
 
 class DogCatDataset(ImageClassificationDataset):
diff --git a/paddle_hub/dataset/flowers.py b/paddlehub/dataset/flowers.py
similarity index 92%
rename from paddle_hub/dataset/flowers.py
rename to paddlehub/dataset/flowers.py
index b14927ec76c29056c16d5d4cf63b3fec14475c1a..8f7a02c09c4c4c5ad99dff446bbd4064e62e3dc8 100644
--- a/paddle_hub/dataset/flowers.py
+++ b/paddlehub/dataset/flowers.py
@@ -18,8 +18,8 @@ from __future__ import print_function
 
 import os
 
-import paddle_hub as hub
-from paddle_hub.dataset.base_cv_dataset import ImageClassificationDataset
+import paddlehub as hub
+from paddlehub.dataset.base_cv_dataset import ImageClassificationDataset
 
 
 class FlowersDataset(ImageClassificationDataset):
diff --git a/paddle_hub/dataset/msra_ner.py b/paddlehub/dataset/msra_ner.py
similarity index 95%
rename from paddle_hub/dataset/msra_ner.py
rename to paddlehub/dataset/msra_ner.py
index b9d2fcd214824089cff33fe77008bc3568515df7..53a45fd55dec91c82b9c4000d3f288c44affed42 100644
--- a/paddle_hub/dataset/msra_ner.py
+++ b/paddlehub/dataset/msra_ner.py
@@ -12,14 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from paddle_hub.common.downloader import default_downloader
-from paddle_hub.common.dir import DATA_HOME
-
 import os
 import csv
 import json
 from collections import namedtuple
 
+from paddlehub.common.downloader import default_downloader
+from paddlehub.common.dir import DATA_HOME
+
 DATA_URL = "https://paddlehub-dataset.bj.bcebos.com/msra_ner.tar.gz"
 
 
diff --git a/paddle_hub/finetune/__init__.py b/paddlehub/finetune/__init__.py
similarity index 100%
rename from paddle_hub/finetune/__init__.py
rename to paddlehub/finetune/__init__.py
diff --git a/paddle_hub/finetune/checkpoint.proto b/paddlehub/finetune/checkpoint.proto
similarity index 100%
rename from paddle_hub/finetune/checkpoint.proto
rename to paddlehub/finetune/checkpoint.proto
diff --git a/paddle_hub/finetune/checkpoint.py b/paddlehub/finetune/checkpoint.py
similarity index 96%
rename from paddle_hub/finetune/checkpoint.py
rename to paddlehub/finetune/checkpoint.py
index 5609767a5da14c60b4ed0d44563fc82c3732e1e6..4fa987df6d7256db7224742f6b43aa8138fc581c 100644
--- a/paddle_hub/finetune/checkpoint.py
+++ b/paddlehub/finetune/checkpoint.py
@@ -20,8 +20,8 @@ import os
 
 import paddle.fluid as fluid
 
-from paddle_hub.finetune import checkpoint_pb2
-from paddle_hub.common.logger import logger
+from paddlehub.finetune import checkpoint_pb2
+from paddlehub.common.logger import logger
 
 CKPT_FILE_NAME = "ckpt.meta"
 
diff --git a/paddle_hub/finetune/checkpoint_pb2.py b/paddlehub/finetune/checkpoint_pb2.py
similarity index 100%
rename from paddle_hub/finetune/checkpoint_pb2.py
rename to paddlehub/finetune/checkpoint_pb2.py
diff --git a/paddle_hub/finetune/config.py b/paddlehub/finetune/config.py
similarity index 96%
rename from paddle_hub/finetune/config.py
rename to paddlehub/finetune/config.py
index 7be21e633f6dd0d2662549279c62d8325696e22e..9d6d6ea8f1392240e8ef28d52219381bd2719acb 100644
--- a/paddle_hub/finetune/config.py
+++ b/paddlehub/finetune/config.py
@@ -12,12 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import time
-
-from .strategy import DefaultStrategy
 from datetime import datetime
+import time
 
-from paddle_hub.common.logger import logger
+from paddlehub.finetune.strategy import DefaultStrategy
+from paddlehub.common.logger import logger
 
 
 class RunConfig(object):
diff --git a/paddle_hub/finetune/finetune.py b/paddlehub/finetune/finetune.py
similarity index 97%
rename from paddle_hub/finetune/finetune.py
rename to paddlehub/finetune/finetune.py
index 78b62915fd9f3ac7f223785f61a7519cc325efb6..b724049601ac1bfacc64b5853c2cc4c785affc79 100644
--- a/paddle_hub/finetune/finetune.py
+++ b/paddlehub/finetune/finetune.py
@@ -22,12 +22,12 @@ import multiprocessing
 
 import paddle
 import paddle.fluid as fluid
-import paddle_hub as hub
-from visualdl import LogWriter
 
-from paddle_hub.common.logger import logger
-from paddle_hub.finetune.strategy import BERTFinetuneStrategy, DefaultStrategy
-from paddle_hub.finetune.checkpoint import load_checkpoint, save_checkpoint
+from paddlehub.common.logger import logger
+from paddlehub.finetune.strategy import BERTFinetuneStrategy, DefaultStrategy
+from paddlehub.finetune.checkpoint import load_checkpoint, save_checkpoint
+from visualdl import LogWriter
+import paddlehub as hub
 
 
 def _get_running_device_info(config):
diff --git a/paddle_hub/finetune/network.py b/paddlehub/finetune/network.py
similarity index 98%
rename from paddle_hub/finetune/network.py
rename to paddlehub/finetune/network.py
index 48f5804b3f2595ae230d98ba15ddc832f4973399..dc3f5c5f319421ba2137cca0791b50658fa43514 100644
--- a/paddle_hub/finetune/network.py
+++ b/paddlehub/finetune/network.py
@@ -14,12 +14,13 @@
 
 import os
 import collections
-import paddle.fluid as fluid
 import time
-import numpy as np
 import multiprocessing
 
-from .task import Task
+import numpy as np
+import paddle.fluid as fluid
+
+from paddlehub.finetune.task import Task
 
 __all__ = ['append_mlp_classifier']
 
diff --git a/paddle_hub/finetune/optimization.py b/paddlehub/finetune/optimization.py
similarity index 100%
rename from paddle_hub/finetune/optimization.py
rename to paddlehub/finetune/optimization.py
diff --git a/paddle_hub/finetune/strategy.py b/paddlehub/finetune/strategy.py
similarity index 98%
rename from paddle_hub/finetune/strategy.py
rename to paddlehub/finetune/strategy.py
index 9725ad5bfe81f4f4f4216878e44b3d7aac0c8b8b..4be8c52231c7a16d3ca8787e2d54a2125a96943a 100644
--- a/paddle_hub/finetune/strategy.py
+++ b/paddlehub/finetune/strategy.py
@@ -16,7 +16,7 @@ import os
 import multiprocessing
 import paddle.fluid as fluid
 
-from .optimization import adam_weight_decay_optimization
+from paddlehub.finetune.optimization import adam_weight_decay_optimization
 
 
 def get_pretrained_parameter(main_program, start_program):
diff --git a/paddle_hub/finetune/task.py b/paddlehub/finetune/task.py
similarity index 99%
rename from paddle_hub/finetune/task.py
rename to paddlehub/finetune/task.py
index 7904a0dd1b710f55fc4362840dc40a9ffc2d564b..24d27c52f96b30465a5b9b8b2d16f41a6bef2ace 100644
--- a/paddle_hub/finetune/task.py
+++ b/paddlehub/finetune/task.py
@@ -14,11 +14,12 @@
 
 import os
 import collections
-import paddle.fluid as fluid
 import time
-import numpy as np
 import multiprocessing
 
+import numpy as np
+import paddle.fluid as fluid
+
 
 class Task(object):
     def __init__(self, task_type, graph_var_dict, main_program,
diff --git a/paddle_hub/io/__init__.py b/paddlehub/io/__init__.py
similarity index 100%
rename from paddle_hub/io/__init__.py
rename to paddlehub/io/__init__.py
diff --git a/paddle_hub/io/augmentation.py b/paddlehub/io/augmentation.py
similarity index 99%
rename from paddle_hub/io/augmentation.py
rename to paddlehub/io/augmentation.py
index e48b0ef68f8a86f77a8be0a7beaf5756eb528a88..ec5e8a6c909c8f0602d9ba6e426cb5d36cb270a5 100644
--- a/paddle_hub/io/augmentation.py
+++ b/paddlehub/io/augmentation.py
@@ -15,10 +15,12 @@
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
+
 from PIL import Image, ImageEnhance
-from paddle_hub.common import utils
 import numpy as np
 
+from paddlehub.common import utils
+
 
 def _check_range_0_1(value):
     value = value if value <= 1 else 1
diff --git a/paddle_hub/io/postprocess.py b/paddlehub/io/postprocess.py
similarity index 100%
rename from paddle_hub/io/postprocess.py
rename to paddlehub/io/postprocess.py
diff --git a/paddle_hub/io/preprocess.py b/paddlehub/io/preprocess.py
similarity index 100%
rename from paddle_hub/io/preprocess.py
rename to paddlehub/io/preprocess.py
diff --git a/paddle_hub/io/reader.py b/paddlehub/io/reader.py
similarity index 100%
rename from paddle_hub/io/reader.py
rename to paddlehub/io/reader.py
diff --git a/paddle_hub/io/type.py b/paddlehub/io/type.py
similarity index 95%
rename from paddle_hub/io/type.py
rename to paddlehub/io/type.py
index e562b8cc4098ea678619caaf8932268c9803c4b1..3fe43abe9f898a0cb77ac237126a65c335135b31 100644
--- a/paddle_hub/io/type.py
+++ b/paddlehub/io/type.py
@@ -13,9 +13,11 @@
 # limitations under the License.
 
 from enum import Enum
+
 from PIL import Image
-from paddle_hub.common.logger import logger
-from paddle_hub.common import utils
+
+from paddlehub.common.logger import logger
+from paddlehub.common import utils
 
 
 class DataType(Enum):
diff --git a/paddle_hub/module/__init__.py b/paddlehub/module/__init__.py
similarity index 100%
rename from paddle_hub/module/__init__.py
rename to paddlehub/module/__init__.py
diff --git a/paddle_hub/module/base_processor.py b/paddlehub/module/base_processor.py
similarity index 100%
rename from paddle_hub/module/base_processor.py
rename to paddlehub/module/base_processor.py
diff --git a/paddle_hub/module/check_info.proto b/paddlehub/module/check_info.proto
similarity index 100%
rename from paddle_hub/module/check_info.proto
rename to paddlehub/module/check_info.proto
diff --git a/paddle_hub/module/check_info_pb2.py b/paddlehub/module/check_info_pb2.py
similarity index 100%
rename from paddle_hub/module/check_info_pb2.py
rename to paddlehub/module/check_info_pb2.py
diff --git a/paddle_hub/module/checker.py b/paddlehub/module/checker.py
similarity index 97%
rename from paddle_hub/module/checker.py
rename to paddlehub/module/checker.py
index fc1be77d2acf19d10d1d340c104a9fa281ad09ff..d8ecb4ff7e7f2d41bd8f2bb8fa57e9efd8f9b610 100644
--- a/paddle_hub/module/checker.py
+++ b/paddlehub/module/checker.py
@@ -14,12 +14,15 @@
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
-from paddle_hub.common.logger import logger
-from paddle_hub.module import check_info_pb2
-from paddle_hub.version import hub_version, module_proto_version
+
 import os
+
 import paddle
 
+from paddlehub.common.logger import logger
+from paddlehub.module import check_info_pb2
+from paddlehub.version import hub_version, module_proto_version
+
 # check info
 CHECK_INFO_PB_FILENAME = "check_info.pb"
 FILE_SEP = "/"
diff --git a/paddle_hub/module/manager.py b/paddlehub/module/manager.py
similarity index 95%
rename from paddle_hub/module/manager.py
rename to paddlehub/module/manager.py
index 06069a5c4243e5b684ce796270c392ad9930acbe..98bfa11835dc97a28fb622d0f72466c81b6b2971 100644
--- a/paddle_hub/module/manager.py
+++ b/paddlehub/module/manager.py
@@ -19,10 +19,10 @@ from __future__ import print_function
 import os
 import shutil
 
-from paddle_hub.common import utils
-from paddle_hub.common.downloader import default_downloader
-from paddle_hub.common.dir import MODULE_HOME
-import paddle_hub as hub
+from paddlehub.common import utils
+from paddlehub.common.downloader import default_downloader
+from paddlehub.common.dir import MODULE_HOME
+import paddlehub as hub
 
 
 class LocalModuleManager:
diff --git a/paddle_hub/module/module.py b/paddlehub/module/module.py
similarity index 97%
rename from paddle_hub/module/module.py
rename to paddlehub/module/module.py
index b412ad7df175a69652d6face11957de846602fd2..85e3169fdc7a03ff3a9badf580b10f34be41d7bb 100644
--- a/paddle_hub/module/module.py
+++ b/paddlehub/module/module.py
@@ -25,18 +25,18 @@ from shutil import copyfile
 import paddle
 import paddle.fluid as fluid
 
-from paddle_hub.common import utils
-from paddle_hub.common import paddle_helper
-from paddle_hub.common.logger import logger
-from paddle_hub.common.downloader import default_downloader
-from paddle_hub.module import module_desc_pb2
-from paddle_hub.module import check_info_pb2
-from paddle_hub.module.signature import Signature, create_signature
-from paddle_hub.module.checker import ModuleChecker
-from paddle_hub.module.manager import default_module_manager
-from paddle_hub.module.base_processor import BaseProcessor
-from paddle_hub.io.reader import yaml_reader
-from paddle_hub import version
+from paddlehub.common import utils
+from paddlehub.common import paddle_helper
+from paddlehub.common.logger import logger
+from paddlehub.common.downloader import default_downloader
+from paddlehub.module import module_desc_pb2
+from paddlehub.module import check_info_pb2
+from paddlehub.module.signature import Signature, create_signature
+from paddlehub.module.checker import ModuleChecker
+from paddlehub.module.manager import default_module_manager
+from paddlehub.module.base_processor import BaseProcessor
+from paddlehub.io.reader import yaml_reader
+from paddlehub import version
 
 __all__ = ['Module', 'create_module']
 
diff --git a/paddle_hub/module/module_desc.proto b/paddlehub/module/module_desc.proto
similarity index 100%
rename from paddle_hub/module/module_desc.proto
rename to paddlehub/module/module_desc.proto
diff --git a/paddle_hub/module/module_desc_pb2.py b/paddlehub/module/module_desc_pb2.py
similarity index 100%
rename from paddle_hub/module/module_desc_pb2.py
rename to paddlehub/module/module_desc_pb2.py
diff --git a/paddle_hub/module/signature.py b/paddlehub/module/signature.py
similarity index 98%
rename from paddle_hub/module/signature.py
rename to paddlehub/module/signature.py
index 163539a8a6bff8f7a6f7dccdf206d82ae13e16f1..11d5bdea3b6466131b27ceab2f467d342ebd3251 100644
--- a/paddle_hub/module/signature.py
+++ b/paddlehub/module/signature.py
@@ -15,8 +15,10 @@
 from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
+
 from paddle.fluid.framework import Variable
-from paddle_hub.common.utils import to_list
+
+from paddlehub.common.utils import to_list
 
 
 class Signature:
diff --git a/paddle_hub/reader/__init__.py b/paddlehub/reader/__init__.py
similarity index 100%
rename from paddle_hub/reader/__init__.py
rename to paddlehub/reader/__init__.py
diff --git a/paddle_hub/reader/batching.py b/paddlehub/reader/batching.py
similarity index 100%
rename from paddle_hub/reader/batching.py
rename to paddlehub/reader/batching.py
diff --git a/paddle_hub/reader/cv_reader.py b/paddlehub/reader/cv_reader.py
similarity index 98%
rename from paddle_hub/reader/cv_reader.py
rename to paddlehub/reader/cv_reader.py
index df75f0d3967c9cdb1f975981f21404c6c052c5db..0b8e37dbdcc1aec88e164a372fb23a8b99e009d5 100644
--- a/paddle_hub/reader/cv_reader.py
+++ b/paddlehub/reader/cv_reader.py
@@ -20,7 +20,7 @@ import paddle
 import numpy as np
 from PIL import Image
 
-import paddle_hub.io.augmentation as image_augmentation
+import paddlehub.io.augmentation as image_augmentation
 
 color_mode_dict = {
     "RGB": [0, 1, 2],
diff --git a/paddle_hub/reader/nlp_reader.py b/paddlehub/reader/nlp_reader.py
similarity index 98%
rename from paddle_hub/reader/nlp_reader.py
rename to paddlehub/reader/nlp_reader.py
index 4da1e7d75757d835d43df220fe383c3fbf5af366..5a37a79940eab5bd200fca814a9c9dc0e114b8dc 100644
--- a/paddle_hub/reader/nlp_reader.py
+++ b/paddlehub/reader/nlp_reader.py
@@ -17,9 +17,9 @@ import types
 import csv
 import numpy as np
 
-#from paddle_hub import dataset
-from paddle_hub.reader import tokenization
-from .batching import prepare_batch_data
+#from paddlehub import dataset
+from paddlehub.reader import tokenization
+from paddlehub.reader.batching import prepare_batch_data
 
 
 class BERTTokenizeReader(object):
diff --git a/paddle_hub/reader/tokenization.py b/paddlehub/reader/tokenization.py
similarity index 100%
rename from paddle_hub/reader/tokenization.py
rename to paddlehub/reader/tokenization.py
diff --git a/paddle_hub/version.py b/paddlehub/version.py
similarity index 100%
rename from paddle_hub/version.py
rename to paddlehub/version.py
diff --git a/scripts/gen_proto.sh b/scripts/gen_proto.sh
index f5b614d70099f95aa5d69915671f3b0d1fa32075..042f5d341d168454828f1b3cc59274c61cb2cd31 100755
--- a/scripts/gen_proto.sh
+++ b/scripts/gen_proto.sh
@@ -1,4 +1,4 @@
 #/bin/bash
-protoc -I=../paddle_hub/module --python_out=../paddle_hub/module ../paddle_hub/module/module_desc.proto
-protoc -I=../paddle_hub/module --python_out=../paddle_hub/module ../paddle_hub/module/check_info.proto
-protoc -I=../paddle_hub/finetune --python_out=../paddle_hub/finetune ../paddle_hub/finetune/checkpoint.proto
+protoc -I=../paddlehub/module --python_out=../paddlehub/module ../paddlehub/module/module_desc.proto
+protoc -I=../paddlehub/module --python_out=../paddlehub/module ../paddlehub/module/check_info.proto
+protoc -I=../paddlehub/finetune --python_out=../paddlehub/finetune ../paddlehub/finetune/checkpoint.proto
diff --git a/setup.py b/setup.py
index 559c496e3a8d0c14af359c3ff12eafa0c99f457e..30e34cb3cfcc6b1cb77fef244baf3fd1d18f089a 100644
--- a/setup.py
+++ b/setup.py
@@ -18,14 +18,14 @@ from __future__ import print_function
 
 from setuptools import find_packages
 from setuptools import setup
-from paddle_hub.version import hub_version
+from paddlehub.version import hub_version
 
 REQUIRED_PACKAGES = [
     'numpy >= 1.12.0', 'six >= 1.10.0', 'protobuf >= 3.1.0', 'pyyaml', 'numpy'
 ]
 
 setup(
-    name='paddle_hub',
+    name='paddlehub',
     version=hub_version.replace('-', ''),
     description=('PaddleHub is a library to foster the publication, '
                  'discovery, and consumption of reusable parts of machine '
@@ -56,5 +56,5 @@ setup(
         'Topic :: Software Development :: Libraries :: Python Modules',
     ],
     license='Apache 2.0',
-    keywords=('paddlepaddle pretrained paddle-hub'),
-    entry_points={'console_scripts': ['hub=paddle_hub.commands.hub:main']})
+    keywords=('paddlepaddle pretrained paddlehub'),
+    entry_points={'console_scripts': ['hub=paddlehub.commands.hub:main']})
diff --git a/tests/test_downloader.py b/tests/test_downloader.py
index 2df20b3726f705b9c8dc994bff355408901bd09a..cbd69a8b01775dceb5ec1656b5a39ed7f1e8c3d1 100644
--- a/tests/test_downloader.py
+++ b/tests/test_downloader.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 import unittest
-import paddle_hub as hub
+import paddlehub as hub
 
 
 class TestDownloader(unittest.TestCase):
diff --git a/tests/test_export_n_load_module.py b/tests/test_export_n_load_module.py
index 4ddd5ae2bfec7eff795fef847fbfcdf5779c68d0..c2f7ef57ada824d16f9e63bb439633df203473fe 100644
--- a/tests/test_export_n_load_module.py
+++ b/tests/test_export_n_load_module.py
@@ -19,7 +19,7 @@ from __future__ import print_function
 import numpy as np
 import paddle.fluid as fluid
 import paddle
-import paddle_hub as hub
+import paddlehub as hub
 import unittest
 import os
 
diff --git a/tests/test_module.py b/tests/test_module.py
index 76791c927503eec05cae82ef08d2011b62964161..6734a0b7b4bcddc66590c85dad02acd94d32c8b5 100644
--- a/tests/test_module.py
+++ b/tests/test_module.py
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 import unittest
-import paddle_hub as hub
+import paddlehub as hub
 import paddle.fluid as fluid
 
 
diff --git a/tests/test_param_serialize.py b/tests/test_param_serialize.py
index 813635a7e220d50365ec03fb0d3c3ea5cabbcb18..71ed83a32d843721de8605f9491b81b28528099e 100644
--- a/tests/test_param_serialize.py
+++ b/tests/test_param_serialize.py
@@ -13,11 +13,11 @@
 # limitations under the License.
 
 import unittest
-import paddle_hub as hub
+import paddlehub as hub
 import paddle.fluid as fluid
-from paddle_hub.paddle_helper import from_param_to_flexible_data, from_flexible_data_to_param
-from paddle_hub import module_desc_pb2
-from paddle_hub.logger import logger
+from paddlehub.paddle_helper import from_param_to_flexible_data, from_flexible_data_to_param
+from paddlehub import module_desc_pb2
+from paddlehub.logger import logger
 
 
 class TestParamAttrSerializeAndDeSerialize(unittest.TestCase):
diff --git a/tests/test_pyobj_serialize.py b/tests/test_pyobj_serialize.py
index 7a9433ea25e07509a215721fdbf710923a38c274..15ab9433f845d65971e8199dbadbe3101e7d14cb 100644
--- a/tests/test_pyobj_serialize.py
+++ b/tests/test_pyobj_serialize.py
@@ -15,11 +15,11 @@
 import sys
 import math
 import unittest
-import paddle_hub as hub
+import paddlehub as hub
 import paddle.fluid as fluid
-from paddle_hub.utils import from_pyobj_to_flexible_data, from_flexible_data_to_pyobj, get_pykey
-from paddle_hub import module_desc_pb2
-from paddle_hub.logger import logger
+from paddlehub.utils import from_pyobj_to_flexible_data, from_flexible_data_to_pyobj, get_pykey
+from paddlehub import module_desc_pb2
+from paddlehub.logger import logger
 
 
 def _compare_float(a, b):
diff --git a/tests/test_signature.py b/tests/test_signature.py
index fa04953935d2ee36e7e4525739fb28cb44ae9c4c..6ab780893aed32257f9fe90f16ad418382b19dc0 100644
--- a/tests/test_signature.py
+++ b/tests/test_signature.py
@@ -13,9 +13,9 @@
 # limitations under the License.
 
 import unittest
-import paddle_hub as hub
+import paddlehub as hub
 import paddle.fluid as fluid
-from paddle_hub import create_signature
+from paddlehub import create_signature
 
 
 class TestSignature(unittest.TestCase):
diff --git a/tests/test_train_w2v.py b/tests/test_train_w2v.py
index 1e3459e0e90b1b02c88a1f7aa1d478573c7c696c..436c21264d2fbfc099daeab456a19387300ad56d 100644
--- a/tests/test_train_w2v.py
+++ b/tests/test_train_w2v.py
@@ -5,7 +5,7 @@ from __future__ import print_function
 
 import paddle
 import paddle.fluid as fluid
-import paddle_hub as hub
+import paddlehub as hub
 import unittest
 import os