diff --git a/.travis.yml b/.travis.yml
index 73e0fac..88523c9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,8 +11,8 @@ install:
   - pip install coveralls
   
 script:
-  - python -m pytest --cov=pytrade/
-  - flake8 pytrade
+  - python -m pytest --cov=pytrading/
+  - flake8 pytrading
 
 after_success:
   - coveralls
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 5b2a292..640851f 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,7 +1,7 @@
 {
 	"python.pythonPath": "env\\Scripts\\python.exe",
 	"python.testing.pytestArgs": [
-		"pytrade"
+		"pytrading"
 	],
 	"python.testing.pytestEnabled": true,
 	"python.formatting.provider": "black",
diff --git a/README.md b/README.md
index 2133b77..3b3c398 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# pytrade
+# pytrading
 
-[![Build Status](https://travis-ci.org/simongarisch/pytrade.svg?branch=master)](https://travis-ci.org/simongarisch/pytrade)
-[![Coverage Status](https://coveralls.io/repos/github/simongarisch/pytrade/badge.svg)](https://coveralls.io/github/simongarisch/pytrade?branch=master)
+[![Build Status](https://travis-ci.org/simongarisch/pytrading.svg?branch=master)](https://travis-ci.org/simongarisch/pytrading)
+[![Coverage Status](https://coveralls.io/repos/github/simongarisch/pytrading/badge.svg)](https://coveralls.io/github/simongarisch/pytrading?branch=master)
diff --git a/create_environment.bat b/create_environment.bat
index 9a25ec6..3d17db4 100644
--- a/create_environment.bat
+++ b/create_environment.bat
@@ -7,4 +7,4 @@ pip install -r requirements-dev.txt
 
 REM CREATE A UNIQUE JUPYTER KERNEL FOR THIS PROJECT
 pip install ipykernel
-ipython kernel install --user --name=pytrade
+ipython kernel install --user --name=pytrading
diff --git a/notes/01 Assets and Portfolios.ipynb b/notes/01 Assets and Portfolios.ipynb
index 7dc46c3..64a8972 100644
--- a/notes/01 Assets and Portfolios.ipynb	
+++ b/notes/01 Assets and Portfolios.ipynb	
@@ -34,11 +34,11 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 9,
+   "execution_count": 2,
    "metadata": {},
    "outputs": [],
    "source": [
-    "from pytrade.assets import (\n",
+    "from pytrading.assets import (\n",
     "    reset,\n",
     "    Asset,\n",
     "    Cash,\n",
@@ -57,7 +57,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 14,
+   "execution_count": 3,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -70,7 +70,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 17,
+   "execution_count": 4,
    "metadata": {},
    "outputs": [
     {
@@ -87,7 +87,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 18,
+   "execution_count": 5,
    "metadata": {},
    "outputs": [
     {
@@ -104,7 +104,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 19,
+   "execution_count": 6,
    "metadata": {},
    "outputs": [
     {
@@ -128,7 +128,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 20,
+   "execution_count": 7,
    "metadata": {},
    "outputs": [
     {
@@ -137,7 +137,7 @@
        "(1.0, None)"
       ]
      },
-     "execution_count": 20,
+     "execution_count": 7,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -155,7 +155,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 21,
+   "execution_count": 8,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -164,7 +164,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 25,
+   "execution_count": 9,
    "metadata": {},
    "outputs": [
     {
@@ -185,7 +185,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 27,
+   "execution_count": 10,
    "metadata": {},
    "outputs": [
     {
@@ -194,7 +194,7 @@
        "(1.0, 10)"
       ]
      },
-     "execution_count": 27,
+     "execution_count": 10,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -205,7 +205,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 32,
+   "execution_count": 11,
    "metadata": {},
    "outputs": [
     {
@@ -214,7 +214,7 @@
        "(1.0, 10.0)"
       ]
      },
-     "execution_count": 32,
+     "execution_count": 11,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -232,7 +232,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 39,
+   "execution_count": 12,
    "metadata": {},
    "outputs": [
     {
@@ -241,7 +241,7 @@
        "('USD', 'AAA US')"
       ]
      },
-     "execution_count": 39,
+     "execution_count": 12,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -259,7 +259,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 40,
+   "execution_count": 13,
    "metadata": {},
    "outputs": [
     {
@@ -286,7 +286,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 44,
+   "execution_count": 14,
    "metadata": {},
    "outputs": [
     {
@@ -295,7 +295,7 @@
        "True"
       ]
      },
-     "execution_count": 44,
+     "execution_count": 14,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -327,7 +327,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 28,
+   "execution_count": 15,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -337,7 +337,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 30,
+   "execution_count": 16,
    "metadata": {},
    "outputs": [
     {
@@ -356,7 +356,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 35,
+   "execution_count": 17,
    "metadata": {},
    "outputs": [
     {
@@ -365,7 +365,7 @@
        "2000.0"
       ]
      },
-     "execution_count": 35,
+     "execution_count": 17,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -385,7 +385,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 37,
+   "execution_count": 18,
    "metadata": {},
    "outputs": [
     {
@@ -412,12 +412,12 @@
    "metadata": {},
    "source": [
     "### Movements in FX rates\n",
-    "pytrade supports multiple currencies. For example, you could have an AUD denominated portfolio holding assets in USD, GBP, EUR... The only requirement is that FX rates must be avaliable for the portfolio to use in valuation. FxRateEvent is a supported event type which we'll cover later. For this example we'll just set the rates manually."
+    "pytrading supports multiple currencies. For example, you could have an AUD denominated portfolio holding assets in USD, GBP, EUR... The only requirement is that FX rates must be avaliable for the portfolio to use in valuation. FxRateEvent is a supported event type which we'll cover later. For this example we'll just set the rates manually."
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 52,
+   "execution_count": 19,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -431,7 +431,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 53,
+   "execution_count": 20,
    "metadata": {},
    "outputs": [
     {
@@ -440,7 +440,7 @@
        "('AUDUSD', None)"
       ]
      },
-     "execution_count": 53,
+     "execution_count": 20,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -451,7 +451,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 54,
+   "execution_count": 21,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -461,7 +461,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 55,
+   "execution_count": 22,
    "metadata": {},
    "outputs": [
     {
@@ -486,7 +486,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 56,
+   "execution_count": 23,
    "metadata": {},
    "outputs": [
     {
@@ -495,7 +495,7 @@
        "3857.142857142857"
       ]
      },
-     "execution_count": 56,
+     "execution_count": 23,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -516,7 +516,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 57,
+   "execution_count": 24,
    "metadata": {},
    "outputs": [
     {
@@ -525,7 +525,7 @@
        "3857.142857142857"
       ]
      },
-     "execution_count": 57,
+     "execution_count": 24,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -543,7 +543,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 59,
+   "execution_count": 25,
    "metadata": {},
    "outputs": [
     {
@@ -552,7 +552,7 @@
        "4076.923076923076"
       ]
      },
-     "execution_count": 59,
+     "execution_count": 25,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -578,11 +578,11 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 60,
+   "execution_count": 26,
    "metadata": {},
    "outputs": [],
    "source": [
-    "from pytrade.assets import (\n",
+    "from pytrading.assets import (\n",
     "    StaticPriceAsset,\n",
     "    VariablePriceAsset,\n",
     ")"
@@ -590,7 +590,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 61,
+   "execution_count": 27,
    "metadata": {},
    "outputs": [
     {
@@ -599,7 +599,7 @@
        "(True, True)"
       ]
      },
-     "execution_count": 61,
+     "execution_count": 27,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -617,7 +617,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 62,
+   "execution_count": 28,
    "metadata": {},
    "outputs": [
     {
@@ -626,7 +626,7 @@
        "True"
       ]
      },
-     "execution_count": 62,
+     "execution_count": 28,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -644,7 +644,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 63,
+   "execution_count": 29,
    "metadata": {},
    "outputs": [
     {
@@ -653,7 +653,7 @@
        "True"
       ]
      },
-     "execution_count": 63,
+     "execution_count": 29,
      "metadata": {},
      "output_type": "execute_result"
     }
diff --git a/notes/02 The Trade Lifecycle.ipynb b/notes/02 The Trade Lifecycle.ipynb
index 47f20fd..d35cdf6 100644
--- a/notes/02 The Trade Lifecycle.ipynb	
+++ b/notes/02 The Trade Lifecycle.ipynb	
@@ -31,9 +31,9 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from pytrade.compliance import Compliance\n",
-    "from pytrade.broker import Broker\n",
-    "from pytrade.assets import (\n",
+    "from pytrading.compliance import Compliance\n",
+    "from pytrading.broker import Broker\n",
+    "from pytrading.assets import (\n",
     "    reset,\n",
     "    Cash,\n",
     "    Stock,\n",
@@ -117,7 +117,7 @@
     }
    ],
    "source": [
-    "from pytrade import Trade\n",
+    "from pytrading import Trade\n",
     "\n",
     "trade = Trade(portfolio, stock, 100)\n",
     "print(trade)"
@@ -139,7 +139,7 @@
     {
      "data": {
       "text/plain": [
-       "<pytrade.compliance.base.Compliance at 0x29444dd5c50>"
+       "<pytrading.compliance.base.Compliance at 0x29444dd5c50>"
       ]
      },
      "execution_count": 10,
@@ -159,7 +159,7 @@
     {
      "data": {
       "text/plain": [
-       "<pytrade.broker.broker.Broker at 0x29444dd5c88>"
+       "<pytrading.broker.broker.Broker at 0x29444dd5c88>"
       ]
      },
      "execution_count": 11,
@@ -201,7 +201,7 @@
     {
      "data": {
       "text/plain": [
-       "<pytrade.trade.trade_pipeline.ComplianceHandler at 0x29444dc1b38>"
+       "<pytrading.trade.trade_pipeline.ComplianceHandler at 0x29444dc1b38>"
       ]
      },
      "execution_count": 22,
@@ -210,7 +210,7 @@
     }
    ],
    "source": [
-    "from pytrade.trade import trade_pipeline\n",
+    "from pytrading.trade import trade_pipeline\n",
     "\n",
     "trade_pipeline"
    ]
@@ -238,7 +238,7 @@
     {
      "data": {
       "text/plain": [
-       "<pytrade.compliance.base.Compliance at 0x29444e281d0>"
+       "<pytrading.compliance.base.Compliance at 0x29444e281d0>"
       ]
      },
      "execution_count": 12,
@@ -247,7 +247,7 @@
     }
    ],
    "source": [
-    "from pytrade.compliance import Compliance\n",
+    "from pytrading.compliance import Compliance\n",
     "\n",
     "compliance = Compliance()\n",
     "compliance"
@@ -297,7 +297,7 @@
     }
    ],
    "source": [
-    "from pytrade.compliance import UnitLimit\n",
+    "from pytrading.compliance import UnitLimit\n",
     "\n",
     "compliance.add_rule(\n",
     "    UnitLimit(stock, 100)\n",
@@ -364,7 +364,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from pytrade.compliance import ComplianceRule\n",
+    "from pytrading.compliance import ComplianceRule\n",
     "\n",
     "\n",
     "class RestrictedSecurityCode(ComplianceRule):\n",
@@ -436,7 +436,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from pytrade.compliance import UnitLimit, WeightLimit"
+    "from pytrading.compliance import UnitLimit, WeightLimit"
    ]
   },
   {
@@ -475,7 +475,7 @@
     {
      "data": {
       "text/plain": [
-       "<pytrade.broker.broker.Broker at 0x29444dd5c88>"
+       "<pytrading.broker.broker.Broker at 0x29444dd5c88>"
       ]
      },
      "execution_count": 31,
@@ -520,12 +520,12 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from pytrade.broker import (  # execution strategies\n",
+    "from pytrading.broker import (  # execution strategies\n",
     "    FillAtLast,  # default\n",
     "    FillAtLastWithSlippage,\n",
     ")\n",
     "\n",
-    "from pytrade.broker import (  # charge strategies\n",
+    "from pytrading.broker import (  # charge strategies\n",
     "    NoCharges,  # default\n",
     "    FixedRatePlusPercentage,\n",
     ")"
diff --git a/notes/03 Events.ipynb b/notes/03 Events.ipynb
index 8a3602f..16e9fb1 100644
--- a/notes/03 Events.ipynb	
+++ b/notes/03 Events.ipynb	
@@ -25,7 +25,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from pytrade.events import (\n",
+    "from pytrading.events import (\n",
     "    AbstractEvent,\n",
     "    AssetPriceEvent,\n",
     "    FxRateEvent,\n",
@@ -38,7 +38,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "All events in pytrade inherit from AbstractEvent."
+    "All events in pytrading inherit from AbstractEvent."
    ]
   },
   {
@@ -76,7 +76,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from pytrade.assets import reset, Stock"
+    "from pytrading.assets import reset, Stock"
    ]
   },
   {
@@ -260,8 +260,8 @@
    "outputs": [],
    "source": [
     "from datetime import datetime\n",
-    "from pytrade import Trade\n",
-    "from pytrade.assets import reset, Cash, Stock, FxRate, Portfolio\n",
+    "from pytrading import Trade\n",
+    "from pytrading.assets import reset, Cash, Stock, FxRate, Portfolio\n",
     "\n",
     "reset()\n",
     "aud = Cash(\"AUD\")\n",
@@ -447,7 +447,7 @@
     }
    ],
    "source": [
-    "from pytrade import EventsQueue\n",
+    "from pytrading import EventsQueue\n",
     "\n",
     "reset()\n",
     "queue = EventsQueue()\n",
diff --git a/notes/04 Backtesting.ipynb b/notes/04 Backtesting.ipynb
index d9d1059..8fc29d2 100644
--- a/notes/04 Backtesting.ipynb	
+++ b/notes/04 Backtesting.ipynb	
@@ -32,9 +32,9 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from pytrade.assets import reset, Cash, Stock, Portfolio\n",
-    "from pytrade.backtest import Backtest\n",
-    "from pytrade.strategy import Strategy"
+    "from pytrading.assets import reset, Cash, Stock, Portfolio\n",
+    "from pytrading.backtest import Backtest\n",
+    "from pytrading.strategy import Strategy"
    ]
   },
   {
@@ -83,7 +83,7 @@
     {
      "data": {
       "text/plain": [
-       "<pytrade.compliance.base.Compliance at 0x1c666676a58>"
+       "<pytrading.compliance.base.Compliance at 0x1c666676a58>"
       ]
      },
      "execution_count": 4,
@@ -103,7 +103,7 @@
     {
      "data": {
       "text/plain": [
-       "<pytrade.broker.broker.Broker at 0x1c666676a90>"
+       "<pytrading.broker.broker.Broker at 0x1c666676a90>"
       ]
      },
      "execution_count": 5,
@@ -139,7 +139,7 @@
     }
    ],
    "source": [
-    "from pytrade.compliance import Compliance, UnitLimit\n",
+    "from pytrading.compliance import Compliance, UnitLimit\n",
     "\n",
     "portfolio.compliance = Compliance().add_rule(\n",
     "    UnitLimit(stock, 1000)\n",
@@ -161,7 +161,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from pytrade.broker import (\n",
+    "from pytrading.broker import (\n",
     "    Broker,\n",
     "    FillAtLastWithSlippage,\n",
     "    FixedRatePlusPercentage,\n",
@@ -179,7 +179,7 @@
    "source": [
     "### Setting the backtest strategy\n",
     "\n",
-    "All backtests should have a strategy that inherits from pytrade.strategy.Strategy and implements a generate_trades method. Returned trades can either be None, a single trade instance or a list of trades."
+    "All backtests should have a strategy that inherits from pytrading.strategy.Strategy and implements a generate_trades method. Returned trades can either be None, a single trade instance or a list of trades."
    ]
   },
   {
@@ -188,8 +188,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from pytrade import Trade\n",
-    "from pytrade.strategy import Strategy\n",
+    "from pytrading import Trade\n",
+    "from pytrading.strategy import Strategy\n",
     "\n",
     "class BuyAndHold(Strategy):\n",
     "    def generate_trades(self):\n",
@@ -219,7 +219,7 @@
     {
      "data": {
       "text/plain": [
-       "<pytrade.backtest.Backtest at 0x1c666698b38>"
+       "<pytrading.backtest.Backtest at 0x1c666698b38>"
       ]
      },
      "execution_count": 9,
@@ -228,7 +228,7 @@
     }
    ],
    "source": [
-    "from pytrade.backtest import Backtest\n",
+    "from pytrading.backtest import Backtest\n",
     "\n",
     "backtest = Backtest(BuyAndHold())\n",
     "\n",
@@ -249,7 +249,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from pytrade.history import History\n",
+    "from pytrading.history import History\n",
     "\n",
     "history = History(\n",
     "    portfolios=portfolio,\n",
@@ -330,7 +330,7 @@
     {
      "data": {
       "text/plain": [
-       "<bound method Backtest.load_event of <pytrade.backtest.Backtest object at 0x000001C666698B38>>"
+       "<bound method Backtest.load_event of <pytrading.backtest.Backtest object at 0x000001C666698B38>>"
       ]
      },
      "execution_count": 12,
@@ -360,7 +360,7 @@
    ],
    "source": [
     "from datetime import datetime\n",
-    "from pytrade.events import AssetPriceEvent\n",
+    "from pytrading.events import AssetPriceEvent\n",
     "\n",
     "events = [\n",
     "    AssetPriceEvent(stock, datetime(2020, 10, 1), 2.50),\n",
@@ -619,13 +619,13 @@
    "outputs": [],
    "source": [
     "from datetime import datetime\n",
-    "from pytrade import Trade\n",
-    "from pytrade.assets import reset, Cash, Stock, Portfolio\n",
-    "from pytrade.compliance import Compliance, UnitLimit\n",
-    "from pytrade.backtest import Backtest\n",
-    "from pytrade.strategy import Strategy\n",
-    "from pytrade.events import AssetPriceEvent\n",
-    "from pytrade.broker import (\n",
+    "from pytrading import Trade\n",
+    "from pytrading.assets import reset, Cash, Stock, Portfolio\n",
+    "from pytrading.compliance import Compliance, UnitLimit\n",
+    "from pytrading.backtest import Backtest\n",
+    "from pytrading.strategy import Strategy\n",
+    "from pytrading.events import AssetPriceEvent\n",
+    "from pytrading.broker import (\n",
     "    Broker,\n",
     "    FillAtLastWithSlippage,\n",
     "    FixedRatePlusPercentage,\n",
diff --git a/notes/05 Bulk Event Loads.ipynb b/notes/05 Bulk Event Loads.ipynb
index dee948d..86c4dbd 100644
--- a/notes/05 Bulk Event Loads.ipynb	
+++ b/notes/05 Bulk Event Loads.ipynb	
@@ -28,7 +28,7 @@
     {
      "data": {
       "text/plain": [
-       "<function pytrade.events.yahoo.load_yahoo_prices(instances, *args, **kwargs)>"
+       "<function pytrading.events.yahoo.load_yahoo_prices(instances, *args, **kwargs)>"
       ]
      },
      "execution_count": 2,
@@ -37,7 +37,7 @@
     }
    ],
    "source": [
-    "from pytrade.events.yahoo import load_yahoo_prices\n",
+    "from pytrading.events.yahoo import load_yahoo_prices\n",
     "\n",
     "load_yahoo_prices"
    ]
@@ -57,7 +57,7 @@
     {
      "data": {
       "text/plain": [
-       "<pytrade.backtest.Backtest at 0x279b7f2d5c0>"
+       "<pytrading.backtest.Backtest at 0x279b7f2d5c0>"
       ]
      },
      "execution_count": 3,
@@ -66,8 +66,8 @@
     }
    ],
    "source": [
-    "from pytrade.assets import reset, Cash, Stock, FxRate, Portfolio\n",
-    "from pytrade import Trade, Strategy, Backtest, History\n",
+    "from pytrading.assets import reset, Cash, Stock, FxRate, Portfolio\n",
+    "from pytrading import Trade, Strategy, Backtest, History\n",
     "\n",
     "reset()\n",
     "spy = Stock(\"SPY\", currency_code=\"USD\")     # SPDR S&P 500 ETF Trust (SPY) traded in USA\n",
@@ -121,7 +121,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "If this yahoo_ticker attribute is None then pytrade will use the asset code instead."
+    "If this yahoo_ticker attribute is None then pytrading will use the asset code instead."
    ]
   },
   {
@@ -353,7 +353,7 @@
     }
    ],
    "source": [
-    "from pytrade.events import load_frame_events, AssetPriceEvent\n",
+    "from pytrading.events import load_frame_events, AssetPriceEvent\n",
     "\n",
     "load_frame_events(\n",
     "    aaa,                         # load events for stock 'AAA'\n",
diff --git a/notes/06 Example - Buy And Hold.ipynb b/notes/06 Example - Buy And Hold.ipynb
index 3a5023c..2c771a3 100644
--- a/notes/06 Example - Buy And Hold.ipynb	
+++ b/notes/06 Example - Buy And Hold.ipynb	
@@ -27,7 +27,10 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import pytrade"
+    "from pytrading import Trade, Strategy, History, Backtest\n",
+    "from pytrading.assets import Cash, Stock, Portfolio\n",
+    "from pytrading.events import AssetPriceEvent\n",
+    "from pytrading.compliance import Compliance, UnitLimit"
    ]
   },
   {
@@ -35,18 +38,6 @@
    "execution_count": 3,
    "metadata": {},
    "outputs": [],
-   "source": [
-    "from pytrade import Trade, Strategy, History, Backtest\n",
-    "from pytrade.assets import Cash, Stock, Portfolio\n",
-    "from pytrade.events import AssetPriceEvent\n",
-    "from pytrade.compliance import Compliance, UnitLimit"
-   ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": 4,
-   "metadata": {},
-   "outputs": [],
    "source": [
     "stock = Stock(\"SPY\", currency_code=\"USD\")\n",
     "cash = Cash(\"USD\")\n",
@@ -57,7 +48,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 5,
+   "execution_count": 4,
    "metadata": {},
    "outputs": [
     {
@@ -74,7 +65,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 6,
+   "execution_count": 5,
    "metadata": {},
    "outputs": [
     {
@@ -91,7 +82,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 7,
+   "execution_count": 6,
    "metadata": {},
    "outputs": [
     {
@@ -109,7 +100,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 8,
+   "execution_count": 7,
    "metadata": {},
    "outputs": [
     {
@@ -118,7 +109,7 @@
        "1"
       ]
      },
-     "execution_count": 8,
+     "execution_count": 7,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -133,7 +124,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 9,
+   "execution_count": 8,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -144,16 +135,16 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 10,
+   "execution_count": 9,
    "metadata": {},
    "outputs": [
     {
      "data": {
       "text/plain": [
-       "<pytrade.backtest.Backtest at 0x291568480b8>"
+       "<pytrading.backtest.Backtest at 0x25dd777a438>"
       ]
      },
-     "execution_count": 10,
+     "execution_count": 9,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -169,12 +160,12 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 11,
+   "execution_count": 10,
    "metadata": {},
    "outputs": [],
    "source": [
     "from datetime import date\n",
-    "from pytrade.events.yahoo import load_yahoo_prices\n",
+    "from pytrading.events.yahoo import load_yahoo_prices\n",
     "\n",
     "start_date = date(2020, 9, 1)\n",
     "end_date = date(2020, 10, 1)\n",
@@ -183,7 +174,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 12,
+   "execution_count": 11,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -192,7 +183,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 13,
+   "execution_count": 12,
    "metadata": {},
    "outputs": [
     {
@@ -201,7 +192,7 @@
        "100"
       ]
      },
-     "execution_count": 13,
+     "execution_count": 12,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -212,7 +203,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 14,
+   "execution_count": 13,
    "metadata": {},
    "outputs": [
     {
@@ -231,7 +222,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 15,
+   "execution_count": 14,
    "metadata": {},
    "outputs": [
     {
@@ -240,7 +231,7 @@
        "48584.58251953125"
       ]
      },
-     "execution_count": 15,
+     "execution_count": 14,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -260,7 +251,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 16,
+   "execution_count": 15,
    "metadata": {},
    "outputs": [
     {
@@ -269,7 +260,7 @@
        "-1414.9999999999977"
       ]
      },
-     "execution_count": 16,
+     "execution_count": 15,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -280,7 +271,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 18,
+   "execution_count": 16,
    "metadata": {},
    "outputs": [
     {
@@ -518,7 +509,7 @@
        "2020-10-01  48584.582520          100.0   14880.581665  337.040009  1.0"
       ]
      },
-     "execution_count": 18,
+     "execution_count": 16,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -530,7 +521,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 19,
+   "execution_count": 17,
    "metadata": {},
    "outputs": [
     {
@@ -1557,21 +1548,21 @@
        "<div>\n",
        "        \n",
        "        \n",
-       "            <div id=\"b6b9df72-ca3b-4f40-a106-c392a979f0f3\" class=\"plotly-graph-div\" style=\"height:525px; width:100%;\"></div>\n",
+       "            <div id=\"e13c443a-563b-447d-acff-fb9124390506\" class=\"plotly-graph-div\" style=\"height:525px; width:100%;\"></div>\n",
        "            <script type=\"text/javascript\">\n",
        "                require([\"plotly\"], function(Plotly) {\n",
        "                    window.PLOTLYENV=window.PLOTLYENV || {};\n",
        "                    window.PLOTLYENV.BASE_URL='https://plot.ly';\n",
        "                    \n",
-       "                if (document.getElementById(\"b6b9df72-ca3b-4f40-a106-c392a979f0f3\")) {\n",
+       "                if (document.getElementById(\"e13c443a-563b-447d-acff-fb9124390506\")) {\n",
        "                    Plotly.newPlot(\n",
-       "                        'b6b9df72-ca3b-4f40-a106-c392a979f0f3',\n",
+       "                        'e13c443a-563b-447d-acff-fb9124390506',\n",
        "                        [{\"line\": {\"color\": \"rgba(255, 153, 51, 1.0)\", \"dash\": \"solid\", \"shape\": \"linear\", \"width\": 1.3}, \"mode\": \"lines\", \"name\": \"Portfolio\", \"text\": \"\", \"type\": \"scatter\", \"x\": [\"2020-09-01\", \"2020-09-02\", \"2020-09-03\", \"2020-09-04\", \"2020-09-08\", \"2020-09-09\", \"2020-09-10\", \"2020-09-11\", \"2020-09-14\", \"2020-09-15\", \"2020-09-16\", \"2020-09-17\", \"2020-09-18\", \"2020-09-21\", \"2020-09-22\", \"2020-09-23\", \"2020-09-24\", \"2020-09-25\", \"2020-09-28\", \"2020-09-29\", \"2020-09-30\", \"2020-10-01\"], \"y\": [50000.0, 50507.96813964844, 49281.87561035156, 49000.99792480469, 48068.72863769531, 48724.10888671875, 48136.45935058594, 48153.39050292969, 48591.63513183594, 48761.956787109375, 48627.49328613281, 48330.682373046875, 47945.5810546875, 47577.581787109375, 47910.58044433594, 47144.58312988281, 47230.58166503906, 47753.582763671875, 48299.58190917969, 48117.58117675781, 48369.58312988281, 48584.58251953125]}, {\"line\": {\"color\": \"rgba(55, 128, 191, 1.0)\", \"dash\": \"solid\", \"shape\": \"linear\", \"width\": 1.3}, \"mode\": \"lines\", \"name\": \"Portfolio_SPY\", \"text\": \"\", \"type\": \"scatter\", \"x\": [\"2020-09-01\", \"2020-09-02\", \"2020-09-03\", \"2020-09-04\", \"2020-09-08\", \"2020-09-09\", \"2020-09-10\", \"2020-09-11\", \"2020-09-14\", \"2020-09-15\", \"2020-09-16\", \"2020-09-17\", \"2020-09-18\", \"2020-09-21\", \"2020-09-22\", \"2020-09-23\", \"2020-09-24\", \"2020-09-25\", \"2020-09-28\", \"2020-09-29\", \"2020-09-30\", \"2020-10-01\"], \"xaxis\": \"x\", \"y\": [100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0], \"yaxis\": \"y2\"}],\n",
        "                        {\"legend\": {\"bgcolor\": \"#F5F6F9\", \"font\": {\"color\": \"#4D5663\"}}, \"paper_bgcolor\": \"#F5F6F9\", \"plot_bgcolor\": \"#F5F6F9\", \"template\": {\"data\": {\"bar\": [{\"error_x\": {\"color\": \"#2a3f5f\"}, \"error_y\": {\"color\": \"#2a3f5f\"}, \"marker\": {\"line\": {\"color\": \"#E5ECF6\", \"width\": 0.5}}, \"type\": \"bar\"}], \"barpolar\": [{\"marker\": {\"line\": {\"color\": \"#E5ECF6\", \"width\": 0.5}}, \"type\": \"barpolar\"}], \"carpet\": [{\"aaxis\": {\"endlinecolor\": \"#2a3f5f\", \"gridcolor\": \"white\", \"linecolor\": \"white\", \"minorgridcolor\": \"white\", \"startlinecolor\": \"#2a3f5f\"}, \"baxis\": {\"endlinecolor\": \"#2a3f5f\", \"gridcolor\": \"white\", \"linecolor\": \"white\", \"minorgridcolor\": \"white\", \"startlinecolor\": \"#2a3f5f\"}, \"type\": \"carpet\"}], \"choropleth\": [{\"colorbar\": {\"outlinewidth\": 0, \"ticks\": \"\"}, \"type\": \"choropleth\"}], \"contour\": [{\"colorbar\": {\"outlinewidth\": 0, \"ticks\": \"\"}, \"colorscale\": [[0.0, \"#0d0887\"], [0.1111111111111111, \"#46039f\"], [0.2222222222222222, \"#7201a8\"], [0.3333333333333333, \"#9c179e\"], [0.4444444444444444, \"#bd3786\"], [0.5555555555555556, \"#d8576b\"], [0.6666666666666666, \"#ed7953\"], [0.7777777777777778, \"#fb9f3a\"], [0.8888888888888888, \"#fdca26\"], [1.0, \"#f0f921\"]], \"type\": \"contour\"}], \"contourcarpet\": [{\"colorbar\": {\"outlinewidth\": 0, \"ticks\": \"\"}, \"type\": \"contourcarpet\"}], \"heatmap\": [{\"colorbar\": {\"outlinewidth\": 0, \"ticks\": \"\"}, \"colorscale\": [[0.0, \"#0d0887\"], [0.1111111111111111, \"#46039f\"], [0.2222222222222222, \"#7201a8\"], [0.3333333333333333, \"#9c179e\"], [0.4444444444444444, \"#bd3786\"], [0.5555555555555556, \"#d8576b\"], [0.6666666666666666, \"#ed7953\"], [0.7777777777777778, \"#fb9f3a\"], [0.8888888888888888, \"#fdca26\"], [1.0, \"#f0f921\"]], \"type\": \"heatmap\"}], \"heatmapgl\": [{\"colorbar\": {\"outlinewidth\": 0, \"ticks\": \"\"}, \"colorscale\": [[0.0, \"#0d0887\"], [0.1111111111111111, \"#46039f\"], [0.2222222222222222, \"#7201a8\"], [0.3333333333333333, \"#9c179e\"], [0.4444444444444444, \"#bd3786\"], [0.5555555555555556, \"#d8576b\"], [0.6666666666666666, \"#ed7953\"], [0.7777777777777778, \"#fb9f3a\"], [0.8888888888888888, \"#fdca26\"], [1.0, \"#f0f921\"]], \"type\": \"heatmapgl\"}], \"histogram\": [{\"marker\": {\"colorbar\": {\"outlinewidth\": 0, \"ticks\": \"\"}}, \"type\": \"histogram\"}], \"histogram2d\": [{\"colorbar\": {\"outlinewidth\": 0, \"ticks\": \"\"}, \"colorscale\": [[0.0, \"#0d0887\"], [0.1111111111111111, \"#46039f\"], [0.2222222222222222, \"#7201a8\"], [0.3333333333333333, \"#9c179e\"], [0.4444444444444444, \"#bd3786\"], [0.5555555555555556, \"#d8576b\"], [0.6666666666666666, \"#ed7953\"], [0.7777777777777778, \"#fb9f3a\"], [0.8888888888888888, \"#fdca26\"], [1.0, \"#f0f921\"]], \"type\": \"histogram2d\"}], \"histogram2dcontour\": [{\"colorbar\": {\"outlinewidth\": 0, \"ticks\": \"\"}, \"colorscale\": [[0.0, \"#0d0887\"], [0.1111111111111111, \"#46039f\"], [0.2222222222222222, \"#7201a8\"], [0.3333333333333333, \"#9c179e\"], [0.4444444444444444, \"#bd3786\"], [0.5555555555555556, \"#d8576b\"], [0.6666666666666666, \"#ed7953\"], [0.7777777777777778, \"#fb9f3a\"], [0.8888888888888888, \"#fdca26\"], [1.0, \"#f0f921\"]], \"type\": \"histogram2dcontour\"}], \"mesh3d\": [{\"colorbar\": {\"outlinewidth\": 0, \"ticks\": \"\"}, \"type\": \"mesh3d\"}], \"parcoords\": [{\"line\": {\"colorbar\": {\"outlinewidth\": 0, \"ticks\": \"\"}}, \"type\": \"parcoords\"}], \"pie\": [{\"automargin\": true, \"type\": \"pie\"}], \"scatter\": [{\"marker\": {\"colorbar\": {\"outlinewidth\": 0, \"ticks\": \"\"}}, \"type\": \"scatter\"}], \"scatter3d\": [{\"line\": {\"colorbar\": {\"outlinewidth\": 0, \"ticks\": \"\"}}, \"marker\": {\"colorbar\": {\"outlinewidth\": 0, \"ticks\": \"\"}}, \"type\": \"scatter3d\"}], \"scattercarpet\": [{\"marker\": {\"colorbar\": {\"outlinewidth\": 0, \"ticks\": \"\"}}, \"type\": \"scattercarpet\"}], \"scattergeo\": [{\"marker\": {\"colorbar\": {\"outlinewidth\": 0, \"ticks\": \"\"}}, \"type\": \"scattergeo\"}], \"scattergl\": [{\"marker\": {\"colorbar\": {\"outlinewidth\": 0, \"ticks\": \"\"}}, \"type\": \"scattergl\"}], \"scattermapbox\": [{\"marker\": {\"colorbar\": {\"outlinewidth\": 0, \"ticks\": \"\"}}, \"type\": \"scattermapbox\"}], \"scatterpolar\": [{\"marker\": {\"colorbar\": {\"outlinewidth\": 0, \"ticks\": \"\"}}, \"type\": \"scatterpolar\"}], \"scatterpolargl\": [{\"marker\": {\"colorbar\": {\"outlinewidth\": 0, \"ticks\": \"\"}}, \"type\": \"scatterpolargl\"}], \"scatterternary\": [{\"marker\": {\"colorbar\": {\"outlinewidth\": 0, \"ticks\": \"\"}}, \"type\": \"scatterternary\"}], \"surface\": [{\"colorbar\": {\"outlinewidth\": 0, \"ticks\": \"\"}, \"colorscale\": [[0.0, \"#0d0887\"], [0.1111111111111111, \"#46039f\"], [0.2222222222222222, \"#7201a8\"], [0.3333333333333333, \"#9c179e\"], [0.4444444444444444, \"#bd3786\"], [0.5555555555555556, \"#d8576b\"], [0.6666666666666666, \"#ed7953\"], [0.7777777777777778, \"#fb9f3a\"], [0.8888888888888888, \"#fdca26\"], [1.0, \"#f0f921\"]], \"type\": \"surface\"}], \"table\": [{\"cells\": {\"fill\": {\"color\": \"#EBF0F8\"}, \"line\": {\"color\": \"white\"}}, \"header\": {\"fill\": {\"color\": \"#C8D4E3\"}, \"line\": {\"color\": \"white\"}}, \"type\": \"table\"}]}, \"layout\": {\"annotationdefaults\": {\"arrowcolor\": \"#2a3f5f\", \"arrowhead\": 0, \"arrowwidth\": 1}, \"coloraxis\": {\"colorbar\": {\"outlinewidth\": 0, \"ticks\": \"\"}}, \"colorscale\": {\"diverging\": [[0, \"#8e0152\"], [0.1, \"#c51b7d\"], [0.2, \"#de77ae\"], [0.3, \"#f1b6da\"], [0.4, \"#fde0ef\"], [0.5, \"#f7f7f7\"], [0.6, \"#e6f5d0\"], [0.7, \"#b8e186\"], [0.8, \"#7fbc41\"], [0.9, \"#4d9221\"], [1, \"#276419\"]], \"sequential\": [[0.0, \"#0d0887\"], [0.1111111111111111, \"#46039f\"], [0.2222222222222222, \"#7201a8\"], [0.3333333333333333, \"#9c179e\"], [0.4444444444444444, \"#bd3786\"], [0.5555555555555556, \"#d8576b\"], [0.6666666666666666, \"#ed7953\"], [0.7777777777777778, \"#fb9f3a\"], [0.8888888888888888, \"#fdca26\"], [1.0, \"#f0f921\"]], \"sequentialminus\": [[0.0, \"#0d0887\"], [0.1111111111111111, \"#46039f\"], [0.2222222222222222, \"#7201a8\"], [0.3333333333333333, \"#9c179e\"], [0.4444444444444444, \"#bd3786\"], [0.5555555555555556, \"#d8576b\"], [0.6666666666666666, \"#ed7953\"], [0.7777777777777778, \"#fb9f3a\"], [0.8888888888888888, \"#fdca26\"], [1.0, \"#f0f921\"]]}, \"colorway\": [\"#636efa\", \"#EF553B\", \"#00cc96\", \"#ab63fa\", \"#FFA15A\", \"#19d3f3\", \"#FF6692\", \"#B6E880\", \"#FF97FF\", \"#FECB52\"], \"font\": {\"color\": \"#2a3f5f\"}, \"geo\": {\"bgcolor\": \"white\", \"lakecolor\": \"white\", \"landcolor\": \"#E5ECF6\", \"showlakes\": true, \"showland\": true, \"subunitcolor\": \"white\"}, \"hoverlabel\": {\"align\": \"left\"}, \"hovermode\": \"closest\", \"mapbox\": {\"style\": \"light\"}, \"paper_bgcolor\": \"white\", \"plot_bgcolor\": \"#E5ECF6\", \"polar\": {\"angularaxis\": {\"gridcolor\": \"white\", \"linecolor\": \"white\", \"ticks\": \"\"}, \"bgcolor\": \"#E5ECF6\", \"radialaxis\": {\"gridcolor\": \"white\", \"linecolor\": \"white\", \"ticks\": \"\"}}, \"scene\": {\"xaxis\": {\"backgroundcolor\": \"#E5ECF6\", \"gridcolor\": \"white\", \"gridwidth\": 2, \"linecolor\": \"white\", \"showbackground\": true, \"ticks\": \"\", \"zerolinecolor\": \"white\"}, \"yaxis\": {\"backgroundcolor\": \"#E5ECF6\", \"gridcolor\": \"white\", \"gridwidth\": 2, \"linecolor\": \"white\", \"showbackground\": true, \"ticks\": \"\", \"zerolinecolor\": \"white\"}, \"zaxis\": {\"backgroundcolor\": \"#E5ECF6\", \"gridcolor\": \"white\", \"gridwidth\": 2, \"linecolor\": \"white\", \"showbackground\": true, \"ticks\": \"\", \"zerolinecolor\": \"white\"}}, \"shapedefaults\": {\"line\": {\"color\": \"#2a3f5f\"}}, \"ternary\": {\"aaxis\": {\"gridcolor\": \"white\", \"linecolor\": \"white\", \"ticks\": \"\"}, \"baxis\": {\"gridcolor\": \"white\", \"linecolor\": \"white\", \"ticks\": \"\"}, \"bgcolor\": \"#E5ECF6\", \"caxis\": {\"gridcolor\": \"white\", \"linecolor\": \"white\", \"ticks\": \"\"}}, \"title\": {\"x\": 0.05}, \"xaxis\": {\"automargin\": true, \"gridcolor\": \"white\", \"linecolor\": \"white\", \"ticks\": \"\", \"title\": {\"standoff\": 15}, \"zerolinecolor\": \"white\", \"zerolinewidth\": 2}, \"yaxis\": {\"automargin\": true, \"gridcolor\": \"white\", \"linecolor\": \"white\", \"ticks\": \"\", \"title\": {\"standoff\": 15}, \"zerolinecolor\": \"white\", \"zerolinewidth\": 2}}}, \"title\": {\"font\": {\"color\": \"#4D5663\"}, \"text\": \"Buy and Hold\"}, \"xaxis\": {\"gridcolor\": \"#E1E5ED\", \"showgrid\": true, \"tickfont\": {\"color\": \"#4D5663\"}, \"title\": {\"font\": {\"color\": \"#4D5663\"}, \"text\": \"\"}, \"zerolinecolor\": \"#E1E5ED\"}, \"yaxis\": {\"gridcolor\": \"#E1E5ED\", \"showgrid\": true, \"tickfont\": {\"color\": \"#4D5663\"}, \"title\": {\"font\": {\"color\": \"#4D5663\"}, \"text\": \"\"}, \"zerolinecolor\": \"#E1E5ED\"}, \"yaxis2\": {\"anchor\": \"x\", \"gridcolor\": \"#E1E5ED\", \"overlaying\": \"y\", \"showgrid\": true, \"side\": \"right\", \"tickfont\": {\"color\": \"#4D5663\"}, \"title\": {\"text\": \"\"}, \"zerolinecolor\": \"#E1E5ED\"}},\n",
        "                        {\"showLink\": true, \"linkText\": \"Export to plot.ly\", \"plotlyServerURL\": \"https://plot.ly\", \"responsive\": true}\n",
        "                    ).then(function(){\n",
        "                            \n",
-       "var gd = document.getElementById('b6b9df72-ca3b-4f40-a106-c392a979f0f3');\n",
+       "var gd = document.getElementById('e13c443a-563b-447d-acff-fb9124390506');\n",
        "var x = new MutationObserver(function (mutations, observer) {{\n",
        "        var display = window.getComputedStyle(gd).display;\n",
        "        if (!display || display === 'none') {{\n",
diff --git a/notes/07 Example - Indicator.ipynb b/notes/07 Example - Indicator.ipynb
index ec13e9b..d12253a 100644
--- a/notes/07 Example - Indicator.ipynb	
+++ b/notes/07 Example - Indicator.ipynb	
@@ -25,10 +25,10 @@
    "outputs": [],
    "source": [
     "from datetime import date\n",
-    "from pytrade import Trade, Strategy, History, Backtest\n",
-    "from pytrade.assets import reset, Stock, Cash, FxRate, Portfolio\n",
-    "from pytrade.events.yahoo import load_yahoo_prices\n",
-    "from pytrade.compliance import Compliance, UnitLimit"
+    "from pytrading import Trade, Strategy, History, Backtest\n",
+    "from pytrading.assets import reset, Stock, Cash, FxRate, Portfolio\n",
+    "from pytrading.events.yahoo import load_yahoo_prices\n",
+    "from pytrading.compliance import Compliance, UnitLimit"
    ]
   },
   {
diff --git a/notes/08 Example - FX.ipynb b/notes/08 Example - FX.ipynb
index 9b3401a..7c138cd 100644
--- a/notes/08 Example - FX.ipynb	
+++ b/notes/08 Example - FX.ipynb	
@@ -25,10 +25,10 @@
    "outputs": [],
    "source": [
     "from datetime import date\n",
-    "from pytrade import Trade, Strategy, History, Backtest\n",
-    "from pytrade.assets import reset, Cash, FxRate, Portfolio\n",
-    "from pytrade.events.yahoo import load_yahoo_prices\n",
-    "from pytrade.compliance import Compliance, UnitLimit"
+    "from pytrading import Trade, Strategy, History, Backtest\n",
+    "from pytrading.assets import reset, Cash, FxRate, Portfolio\n",
+    "from pytrading.events.yahoo import load_yahoo_prices\n",
+    "from pytrading.compliance import Compliance, UnitLimit"
    ]
   },
   {
diff --git a/notes/09 Example - Bitcoin.ipynb b/notes/09 Example - Bitcoin.ipynb
index 2d6283e..d3319fe 100644
--- a/notes/09 Example - Bitcoin.ipynb	
+++ b/notes/09 Example - Bitcoin.ipynb	
@@ -25,10 +25,10 @@
    "outputs": [],
    "source": [
     "from datetime import date\n",
-    "from pytrade import Trade, Strategy, History, Backtest\n",
-    "from pytrade.assets import reset, Cash, FxRate, Portfolio\n",
-    "from pytrade.events.yahoo import load_yahoo_prices\n",
-    "from pytrade.compliance import Compliance, UnitLimit"
+    "from pytrading import Trade, Strategy, History, Backtest\n",
+    "from pytrading.assets import reset, Cash, FxRate, Portfolio\n",
+    "from pytrading.events.yahoo import load_yahoo_prices\n",
+    "from pytrading.compliance import Compliance, UnitLimit"
    ]
   },
   {
diff --git a/notes/10 Example - Intraday Events.ipynb b/notes/10 Example - Intraday Events.ipynb
index 4a60383..a6e8847 100644
--- a/notes/10 Example - Intraday Events.ipynb	
+++ b/notes/10 Example - Intraday Events.ipynb	
@@ -2609,9 +2609,9 @@
     }
    ],
    "source": [
-    "from pytrade import Trade, Strategy, Backtest, History\n",
-    "from pytrade.assets import reset, Cash, Stock, Portfolio\n",
-    "from pytrade.compliance import Compliance, UnitLimit\n",
+    "from pytrading import Trade, Strategy, Backtest, History\n",
+    "from pytrading.assets import reset, Cash, Stock, Portfolio\n",
+    "from pytrading.compliance import Compliance, UnitLimit\n",
     "\n",
     "reset()\n",
     "stock = Stock(\"XXX US\", currency_code=\"USD\")\n",
@@ -2704,7 +2704,7 @@
     }
    ],
    "source": [
-    "from pytrade.events import load_frame_events, AssetPriceEvent, IndicatorEvent\n",
+    "from pytrading.events import load_frame_events, AssetPriceEvent, IndicatorEvent\n",
     "\n",
     "load_frame_events(\n",
     "    stock,                       # load events for stock 'XXX US'\n",
diff --git a/notes/11 Example - FX Intraday with Benchmark.ipynb b/notes/11 Example - FX Intraday with Benchmark.ipynb
index fe7918f..979af9c 100644
--- a/notes/11 Example - FX Intraday with Benchmark.ipynb	
+++ b/notes/11 Example - FX Intraday with Benchmark.ipynb	
@@ -53348,9 +53348,9 @@
     }
    ],
    "source": [
-    "from pytrade import Trade, Strategy, Backtest, History\n",
-    "from pytrade.assets import reset, Cash, FxRate, Portfolio\n",
-    "from pytrade.compliance import Compliance, UnitLimit\n",
+    "from pytrading import Trade, Strategy, Backtest, History\n",
+    "from pytrading.assets import reset, Cash, FxRate, Portfolio\n",
+    "from pytrading.compliance import Compliance, UnitLimit\n",
     "\n",
     "reset()\n",
     "eur = Cash(\"EUR\")\n",
@@ -53421,7 +53421,7 @@
     }
    ],
    "source": [
-    "from pytrade.events import load_frame_events, FxRateEvent, IndicatorEvent\n",
+    "from pytrading.events import load_frame_events, FxRateEvent, IndicatorEvent\n",
     "\n",
     "load_frame_events(\n",
     "    eurusd,                      # load events for 'EURUSD' fx rate\n",
diff --git a/pytrade/__init__.py b/pytrading/__init__.py
similarity index 100%
rename from pytrade/__init__.py
rename to pytrading/__init__.py
diff --git a/pytrade/assets/__init__.py b/pytrading/assets/__init__.py
similarity index 100%
rename from pytrade/assets/__init__.py
rename to pytrading/assets/__init__.py
diff --git a/pytrade/assets/asset.py b/pytrading/assets/asset.py
similarity index 100%
rename from pytrade/assets/asset.py
rename to pytrading/assets/asset.py
diff --git a/pytrade/assets/cash.py b/pytrading/assets/cash.py
similarity index 100%
rename from pytrade/assets/cash.py
rename to pytrading/assets/cash.py
diff --git a/pytrade/assets/codes.py b/pytrading/assets/codes.py
similarity index 100%
rename from pytrade/assets/codes.py
rename to pytrading/assets/codes.py
diff --git a/pytrade/assets/fx_rates.py b/pytrading/assets/fx_rates.py
similarity index 100%
rename from pytrade/assets/fx_rates.py
rename to pytrading/assets/fx_rates.py
diff --git a/pytrade/assets/portfolio.py b/pytrading/assets/portfolio.py
similarity index 100%
rename from pytrade/assets/portfolio.py
rename to pytrading/assets/portfolio.py
diff --git a/pytrade/assets/stock.py b/pytrading/assets/stock.py
similarity index 100%
rename from pytrade/assets/stock.py
rename to pytrading/assets/stock.py
diff --git a/pytrade/backtest.py b/pytrading/backtest.py
similarity index 98%
rename from pytrade/backtest.py
rename to pytrading/backtest.py
index 5a99ac6..7b23eb5 100644
--- a/pytrade/backtest.py
+++ b/pytrading/backtest.py
@@ -1,6 +1,6 @@
 from copy import copy
-from pytrade import trade
-from pytrade import events
+from pytrading import trade
+from pytrading import events
 from .events_queue import EventsQueue
 from .strategy import Strategy
 from .history import History
diff --git a/pytrade/broker/__init__.py b/pytrading/broker/__init__.py
similarity index 100%
rename from pytrade/broker/__init__.py
rename to pytrading/broker/__init__.py
diff --git a/pytrade/broker/broker.py b/pytrading/broker/broker.py
similarity index 90%
rename from pytrade/broker/broker.py
rename to pytrading/broker/broker.py
index 57e326f..94885fa 100644
--- a/pytrade/broker/broker.py
+++ b/pytrading/broker/broker.py
@@ -2,7 +2,7 @@
 A broker will execute some trade for a fee.
 Charges and execution are organised as strategy patterns.
 """
-import pytrade
+import pytrading
 from .charges import NoCharges
 from .execution import FillAtLast
 
@@ -19,7 +19,7 @@ def __init__(
 
     def execute(self, trade):
         """ Apply some charge and execution strategy to the trade. """
-        if not isinstance(trade, pytrade.Trade):
+        if not isinstance(trade, pytrading.Trade):
             raise TypeError("Expecting Trade instance.")
         self._charges_strategy.charge(trade)
         self._execution_strategy.execute(trade)
diff --git a/pytrade/broker/charges.py b/pytrading/broker/charges.py
similarity index 100%
rename from pytrade/broker/charges.py
rename to pytrading/broker/charges.py
diff --git a/pytrade/broker/execution.py b/pytrading/broker/execution.py
similarity index 100%
rename from pytrade/broker/execution.py
rename to pytrading/broker/execution.py
diff --git a/pytrade/compliance/__init__.py b/pytrading/compliance/__init__.py
similarity index 100%
rename from pytrade/compliance/__init__.py
rename to pytrading/compliance/__init__.py
diff --git a/pytrade/compliance/base.py b/pytrading/compliance/base.py
similarity index 100%
rename from pytrade/compliance/base.py
rename to pytrading/compliance/base.py
diff --git a/pytrade/compliance/position_limits.py b/pytrading/compliance/position_limits.py
similarity index 100%
rename from pytrade/compliance/position_limits.py
rename to pytrading/compliance/position_limits.py
diff --git a/pytrade/events/__init__.py b/pytrading/events/__init__.py
similarity index 100%
rename from pytrade/events/__init__.py
rename to pytrading/events/__init__.py
diff --git a/pytrade/events/asset_price_event.py b/pytrading/events/asset_price_event.py
similarity index 100%
rename from pytrade/events/asset_price_event.py
rename to pytrading/events/asset_price_event.py
diff --git a/pytrade/events/base.py b/pytrading/events/base.py
similarity index 100%
rename from pytrade/events/base.py
rename to pytrading/events/base.py
diff --git a/pytrade/events/fx_rate_event.py b/pytrading/events/fx_rate_event.py
similarity index 100%
rename from pytrade/events/fx_rate_event.py
rename to pytrading/events/fx_rate_event.py
diff --git a/pytrade/events/indicator_event.py b/pytrading/events/indicator_event.py
similarity index 100%
rename from pytrade/events/indicator_event.py
rename to pytrading/events/indicator_event.py
diff --git a/pytrade/events/load_frame_events.py b/pytrading/events/load_frame_events.py
similarity index 91%
rename from pytrade/events/load_frame_events.py
rename to pytrading/events/load_frame_events.py
index edc2455..395648c 100644
--- a/pytrade/events/load_frame_events.py
+++ b/pytrading/events/load_frame_events.py
@@ -1,8 +1,8 @@
 import inspect
 import pandas as pd
 from .base import AbstractEvent
-import pytrade
-from pytrade.util import to_datetime
+import pytrading
+from pytrading.util import to_datetime
 
 
 def load_frame_events(
@@ -20,7 +20,7 @@ def load_frame_events(
         raise TypeError("Expecting pd.DataFrame instance.")
     if not isinstance(column, str):
         raise TypeError("Expecting string.")
-    if not isinstance(backtest, pytrade.backtest.Backtest):
+    if not isinstance(backtest, pytrading.backtest.Backtest):
         raise TypeError("Expecting Backtest instance.")
     if not inspect.isclass(event_class):
         raise TypeError("Expecting Event class.")
diff --git a/pytrade/events/trade_event.py b/pytrading/events/trade_event.py
similarity index 91%
rename from pytrade/events/trade_event.py
rename to pytrading/events/trade_event.py
index f71cb87..f0b89a0 100644
--- a/pytrade/events/trade_event.py
+++ b/pytrading/events/trade_event.py
@@ -1,5 +1,5 @@
 from .base import AbstractEvent
-from pytrade.trade import Trade, trade_pipeline
+from pytrading.trade import Trade, trade_pipeline
 
 
 class TradeEvent(AbstractEvent):
diff --git a/pytrade/events/yahoo.py b/pytrading/events/yahoo.py
similarity index 94%
rename from pytrade/events/yahoo.py
rename to pytrading/events/yahoo.py
index cad6f0a..3691825 100644
--- a/pytrade/events/yahoo.py
+++ b/pytrading/events/yahoo.py
@@ -1,10 +1,10 @@
 """ A factory pattern for downloading yahoo data for different objects. """
 from abc import ABC, abstractmethod
 from datetime import datetime, date
-from pytrade.assets import Asset, FxRate
-from pytrade.util import clean_column_name, to_datetime
-from pytrade.backtest import Backtest
-from pytrade.events import (
+from pytrading.assets import Asset, FxRate
+from pytrading.util import clean_column_name, to_datetime
+from pytrading.backtest import Backtest
+from pytrading.events import (
     AssetPriceEvent,
     FxRateEvent,
     IndicatorEvent,
diff --git a/pytrade/events_queue.py b/pytrading/events_queue.py
similarity index 89%
rename from pytrade/events_queue.py
rename to pytrading/events_queue.py
index 471c5fe..6974554 100644
--- a/pytrade/events_queue.py
+++ b/pytrading/events_queue.py
@@ -1,5 +1,5 @@
 from queue import PriorityQueue
-from pytrade import AbstractEvent
+from pytrading import AbstractEvent
 
 
 class EventsQueue(PriorityQueue):
diff --git a/pytrade/history.py b/pytrading/history.py
similarity index 96%
rename from pytrade/history.py
rename to pytrading/history.py
index b8a9012..4f17954 100644
--- a/pytrade/history.py
+++ b/pytrading/history.py
@@ -8,8 +8,8 @@
 from datetime import datetime
 from weakref import WeakSet
 import pandas as pd
-import pytrade
-from pytrade.assets import Asset, FxRate, Portfolio
+import pytrading
+from pytrading.assets import Asset, FxRate, Portfolio
 
 
 class Visitor(ABC):
@@ -68,7 +68,7 @@ def __init__(self, portfolios, *, backtest=None):
                 raise TypeError("Expecting Portfolio instance.")
 
         if backtest is not None:
-            if not isinstance(backtest, pytrade.backtest.Backtest):
+            if not isinstance(backtest, pytrading.backtest.Backtest):
                 raise TypeError("Expecting Backtest instance.")
 
         self._portfolios = portfolios
diff --git a/pytrade/observable.py b/pytrading/observable.py
similarity index 100%
rename from pytrade/observable.py
rename to pytrading/observable.py
diff --git a/pytrade/settings.ini b/pytrading/settings.ini
similarity index 100%
rename from pytrade/settings.ini
rename to pytrading/settings.ini
diff --git a/pytrade/settings.py b/pytrading/settings.py
similarity index 100%
rename from pytrade/settings.py
rename to pytrading/settings.py
diff --git a/pytrade/strategy.py b/pytrading/strategy.py
similarity index 92%
rename from pytrade/strategy.py
rename to pytrading/strategy.py
index 77cfa3d..0a90a8b 100644
--- a/pytrade/strategy.py
+++ b/pytrading/strategy.py
@@ -4,7 +4,7 @@
 """
 from abc import ABC, abstractmethod
 from typing import Union, List
-from pytrade import trade
+from pytrading import trade
 
 
 class Strategy(ABC):
diff --git a/pytrade/trade/__init__.py b/pytrading/trade/__init__.py
similarity index 100%
rename from pytrade/trade/__init__.py
rename to pytrading/trade/__init__.py
diff --git a/pytrade/trade/trade.py b/pytrading/trade/trade.py
similarity index 97%
rename from pytrade/trade/trade.py
rename to pytrading/trade/trade.py
index 9e4ae51..bfaac5b 100644
--- a/pytrade/trade/trade.py
+++ b/pytrading/trade/trade.py
@@ -1,6 +1,6 @@
 """ Defines a proposed trade. """
 from typing import Union
-from pytrade.assets import Asset, Portfolio
+from pytrading.assets import Asset, Portfolio
 
 
 def _check_asset(asset: Union[Asset, str]):
diff --git a/pytrade/trade/trade_pipeline.py b/pytrading/trade/trade_pipeline.py
similarity index 98%
rename from pytrade/trade/trade_pipeline.py
rename to pytrading/trade/trade_pipeline.py
index 4c9dda2..5a81055 100644
--- a/pytrade/trade/trade_pipeline.py
+++ b/pytrading/trade/trade_pipeline.py
@@ -4,7 +4,7 @@
 """
 from copy import deepcopy
 from abc import ABC, abstractmethod
-from pytrade.trade import Trade
+from pytrading.trade import Trade
 
 
 class Handler(ABC):
diff --git a/pytrade/util.py b/pytrading/util.py
similarity index 100%
rename from pytrade/util.py
rename to pytrading/util.py
diff --git a/setup.py b/setup.py
index 46f465b..635a399 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@
 
 
 setup(
-    name="pytrade",
+    name="pytrading",
     version="0.2.0",
     install_requires=[
         "pandas>=1.1.1",
diff --git a/test.bat b/test.bat
index f55c341..0cdb593 100644
--- a/test.bat
+++ b/test.bat
@@ -1,3 +1,3 @@
-python -m pytest --cov=pytrade --cov-report=html --doctest-modules
-flake8 pytrade
+python -m pytest --cov=pytrading --cov-report=html --doctest-modules
+flake8 pytrading
 flake8 tests
diff --git a/tests/test_assets.py b/tests/test_assets.py
index 1255c15..51eca0b 100644
--- a/tests/test_assets.py
+++ b/tests/test_assets.py
@@ -1,7 +1,7 @@
 import pytest
-from pytrade.settings import get_default_currency_code
-from pytrade.assets import reset, Asset, Stock
-from pytrade.observable import Observable
+from pytrading.settings import get_default_currency_code
+from pytrading.assets import reset, Asset, Stock
+from pytrading.observable import Observable
 
 
 def test_is_observable():
diff --git a/tests/test_backtest.py b/tests/test_backtest.py
index 6e60e82..df6dd6d 100644
--- a/tests/test_backtest.py
+++ b/tests/test_backtest.py
@@ -1,11 +1,11 @@
 from datetime import datetime
 import pytest
-import pytrade
-from pytrade.assets import Stock, Portfolio
-from pytrade.backtest import Backtest
-from pytrade.strategy import Strategy
-from pytrade.events import AssetPriceEvent, IndicatorEvent
-from pytrade.compliance import Compliance, UnitLimit
+import pytrading
+from pytrading.assets import Stock, Portfolio
+from pytrading.backtest import Backtest
+from pytrading.strategy import Strategy
+from pytrading.events import AssetPriceEvent, IndicatorEvent
+from pytrading.compliance import Compliance, UnitLimit
 
 
 def test_backtest_indicator():
@@ -51,7 +51,7 @@ def test_backtest_strategy():
     class BasicStrategy(Strategy):
         def generate_trades(self):
             # always buy 1 share of 'HHH AU'
-            return pytrade.Trade(portfolio, stock, 1)
+            return pytrading.Trade(portfolio, stock, 1)
 
     backtest = Backtest(BasicStrategy())
     [backtest.load_event(event) for event in events]
@@ -73,7 +73,7 @@ def test_backtest_strategy_with_compliance():
     class BasicStrategy(Strategy):
         def generate_trades(self):
             # always buy 1 share of 'JJJ AU'
-            return pytrade.Trade(portfolio, stock, 1)
+            return pytrading.Trade(portfolio, stock, 1)
 
     compliance = Compliance()
     compliance.add_rule(UnitLimit(stock, 2))
diff --git a/tests/test_broker.py b/tests/test_broker.py
index c7c0238..e1bf648 100644
--- a/tests/test_broker.py
+++ b/tests/test_broker.py
@@ -1,13 +1,13 @@
 import pytest
-from pytrade import Trade, Broker
-from pytrade.assets import (
+from pytrading import Trade, Broker
+from pytrading.assets import (
     reset,
     Stock,
     Cash,
     FxRate,
     Portfolio,
 )
-from pytrade.broker import (
+from pytrading.broker import (
     AbstractExecution,
     AbstractCharges,
     FillAtLastWithSlippage,
diff --git a/tests/test_cash.py b/tests/test_cash.py
index 699ab47..4ce730f 100644
--- a/tests/test_cash.py
+++ b/tests/test_cash.py
@@ -1,4 +1,4 @@
-from pytrade.assets import reset, Cash
+from pytrading.assets import reset, Cash
 
 
 def test_cash():
diff --git a/tests/test_codes.py b/tests/test_codes.py
index 8d3044e..2e2555a 100644
--- a/tests/test_codes.py
+++ b/tests/test_codes.py
@@ -1,5 +1,5 @@
 import pytest
-from pytrade.assets.codes import (
+from pytrading.assets.codes import (
     check_code,
     check_currency_code,
     Codes,
diff --git a/tests/test_compliance.py b/tests/test_compliance.py
index cc3f3d5..07b3ecf 100644
--- a/tests/test_compliance.py
+++ b/tests/test_compliance.py
@@ -1,6 +1,6 @@
 import pytest
-from pytrade.assets import reset, Stock, Portfolio
-from pytrade.compliance import (
+from pytrading.assets import reset, Stock, Portfolio
+from pytrading.compliance import (
     Compliance,
     UnitLimit,
     WeightLimit,
diff --git a/tests/test_currency.py b/tests/test_currency.py
index a1ace58..0c82129 100644
--- a/tests/test_currency.py
+++ b/tests/test_currency.py
@@ -1,5 +1,5 @@
 import pytest
-from pytrade.assets import reset, Asset, Cash
+from pytrading.assets import reset, Asset, Cash
 
 
 def test_cash_code():
diff --git a/tests/test_events.py b/tests/test_events.py
index 8f7ec54..aa21539 100644
--- a/tests/test_events.py
+++ b/tests/test_events.py
@@ -1,8 +1,8 @@
 import pytest
 from datetime import datetime
-from pytrade.assets import Stock, Portfolio, FxRate
-from pytrade.trade import Trade
-from pytrade.events import (
+from pytrading.assets import Stock, Portfolio, FxRate
+from pytrading.trade import Trade
+from pytrading.events import (
     AssetPriceEvent,
     FxRateEvent,
     TradeEvent,
diff --git a/tests/test_events_queue.py b/tests/test_events_queue.py
index eb25c49..a79a332 100644
--- a/tests/test_events_queue.py
+++ b/tests/test_events_queue.py
@@ -1,8 +1,8 @@
 from datetime import datetime
 import pytest
-from pytrade import EventsQueue
-from pytrade.assets import Stock
-from pytrade.events import AssetPriceEvent
+from pytrading import EventsQueue
+from pytrading.assets import Stock
+from pytrading.events import AssetPriceEvent
 
 
 def test_queue_order():
diff --git a/tests/test_fx_rates.py b/tests/test_fx_rates.py
index 2ecb64a..c4f280f 100644
--- a/tests/test_fx_rates.py
+++ b/tests/test_fx_rates.py
@@ -1,5 +1,5 @@
 import pytest
-from pytrade.assets.fx_rates import FxRate, validate_pair
+from pytrading.assets.fx_rates import FxRate, validate_pair
 
 
 def test_validate_pair():
diff --git a/tests/test_history.py b/tests/test_history.py
index ea758a8..f86860a 100644
--- a/tests/test_history.py
+++ b/tests/test_history.py
@@ -1,8 +1,8 @@
 from datetime import datetime
 import pytest
 import pandas as pd
-from pytrade.assets import reset, Stock, Cash, Portfolio
-from pytrade.history import History
+from pytrading.assets import reset, Stock, Cash, Portfolio
+from pytrading.history import History
 
 
 class TestHistory(object):
diff --git a/tests/test_load_frame.py b/tests/test_load_frame.py
index f9f2ef6..9125be2 100644
--- a/tests/test_load_frame.py
+++ b/tests/test_load_frame.py
@@ -1,11 +1,11 @@
 from datetime import date
 import pytest
 import pandas as pd
-from pytrade.assets import reset, Stock, FxRate, Portfolio
-from pytrade.backtest import Backtest
-from pytrade.strategy import Strategy
-from pytrade.history import History
-from pytrade.events import (
+from pytrading.assets import reset, Stock, FxRate, Portfolio
+from pytrading.backtest import Backtest
+from pytrading.strategy import Strategy
+from pytrading.history import History
+from pytrading.events import (
     AssetPriceEvent,
     FxRateEvent,
     IndicatorEvent,
diff --git a/tests/test_observable.py b/tests/test_observable.py
index b7c1c73..ce0245f 100644
--- a/tests/test_observable.py
+++ b/tests/test_observable.py
@@ -1,4 +1,4 @@
-from pytrade.observable import Observable
+from pytrading.observable import Observable
 
 
 class Something(Observable):
diff --git a/tests/test_portfolio.py b/tests/test_portfolio.py
index 63d964f..f627505 100644
--- a/tests/test_portfolio.py
+++ b/tests/test_portfolio.py
@@ -1,8 +1,8 @@
 import pytest
-from pytrade.assets import reset, FxRate, Stock, Cash, Portfolio
-from pytrade.compliance import Compliance
-from pytrade.broker import Broker
-from pytrade.settings import get_default_currency_code
+from pytrading.assets import reset, FxRate, Stock, Cash, Portfolio
+from pytrading.compliance import Compliance
+from pytrading.broker import Broker
+from pytrading.settings import get_default_currency_code
 
 
 class TestPortfolio(object):
diff --git a/tests/test_settings.py b/tests/test_settings.py
index 8df75d3..ddf073a 100644
--- a/tests/test_settings.py
+++ b/tests/test_settings.py
@@ -1,6 +1,6 @@
 from configparser import ConfigParser
-from pytrade.assets.codes import check_currency_code
-from pytrade.settings import (
+from pytrading.assets.codes import check_currency_code
+from pytrading.settings import (
     config,
     set_default_currency_code,
     get_default_currency_code,
diff --git a/tests/test_stock.py b/tests/test_stock.py
index 458b8b1..9dfb50b 100644
--- a/tests/test_stock.py
+++ b/tests/test_stock.py
@@ -1,4 +1,4 @@
-from pytrade.assets import Stock
+from pytrading.assets import Stock
 
 
 def test_stock_str():
diff --git a/tests/test_strategy1.py b/tests/test_strategy1.py
index 2ce96b9..0958070 100644
--- a/tests/test_strategy1.py
+++ b/tests/test_strategy1.py
@@ -8,13 +8,13 @@
 """
 from datetime import date
 import pandas as pd
-from pytrade import Trade
-from pytrade.assets import reset, Stock, Portfolio
-from pytrade.backtest import Backtest
-from pytrade.strategy import Strategy
-from pytrade.events.yahoo import load_yahoo_prices
-from pytrade.compliance import Compliance, UnitLimit
-from pytrade.history import History
+from pytrading import Trade
+from pytrading.assets import reset, Stock, Portfolio
+from pytrading.backtest import Backtest
+from pytrading.strategy import Strategy
+from pytrading.events.yahoo import load_yahoo_prices
+from pytrading.compliance import Compliance, UnitLimit
+from pytrading.history import History
 
 
 def test_buy_and_hold():
diff --git a/tests/test_strategy2.py b/tests/test_strategy2.py
index 412c634..f569035 100644
--- a/tests/test_strategy2.py
+++ b/tests/test_strategy2.py
@@ -19,13 +19,13 @@
 """
 from datetime import date
 import pandas as pd
-from pytrade import Trade
-from pytrade.assets import reset, Stock, Cash, FxRate, Portfolio
-from pytrade.backtest import Backtest
-from pytrade.strategy import Strategy
-from pytrade.events.yahoo import load_yahoo_prices
-from pytrade.compliance import Compliance, UnitLimit
-from pytrade.history import History
+from pytrading import Trade
+from pytrading.assets import reset, Stock, Cash, FxRate, Portfolio
+from pytrading.backtest import Backtest
+from pytrading.strategy import Strategy
+from pytrading.events.yahoo import load_yahoo_prices
+from pytrading.compliance import Compliance, UnitLimit
+from pytrading.history import History
 
 
 def test_buy_spy_with_indicator():
diff --git a/tests/test_strategy3.py b/tests/test_strategy3.py
index 78851e1..a94a299 100644
--- a/tests/test_strategy3.py
+++ b/tests/test_strategy3.py
@@ -16,13 +16,13 @@
 Total portfolio value will be starting value + pnl.
 """
 from datetime import date
-from pytrade import Trade
-from pytrade.assets import reset, Cash, FxRate, Portfolio
-from pytrade.backtest import Backtest
-from pytrade.strategy import Strategy
-from pytrade.events.yahoo import load_yahoo_prices
-from pytrade.compliance import Compliance, UnitLimit
-from pytrade.history import History
+from pytrading import Trade
+from pytrading.assets import reset, Cash, FxRate, Portfolio
+from pytrading.backtest import Backtest
+from pytrading.strategy import Strategy
+from pytrading.events.yahoo import load_yahoo_prices
+from pytrading.compliance import Compliance, UnitLimit
+from pytrading.history import History
 
 
 def test_audusd_strategy():
diff --git a/tests/test_trade.py b/tests/test_trade.py
index 3d9eed1..9e53106 100644
--- a/tests/test_trade.py
+++ b/tests/test_trade.py
@@ -1,6 +1,6 @@
 import pytest
-from pytrade.assets import reset, Stock, Portfolio
-from pytrade.trade import Trade
+from pytrading.assets import reset, Stock, Portfolio
+from pytrading.trade import Trade
 
 
 class TestTrade(object):
diff --git a/tests/test_trade_handler.py b/tests/test_trade_handler.py
index deea24b..3011968 100644
--- a/tests/test_trade_handler.py
+++ b/tests/test_trade_handler.py
@@ -1,7 +1,7 @@
 import pytest
-from pytrade.assets import reset, Stock, Portfolio
-from pytrade.trade import Trade, trade_pipeline
-from pytrade.trade.trade_pipeline import Handler
+from pytrading.assets import reset, Stock, Portfolio
+from pytrading.trade import Trade, trade_pipeline
+from pytrading.trade.trade_pipeline import Handler
 
 
 class CustomHandler(Handler):
diff --git a/tests/test_util.py b/tests/test_util.py
index c8d886a..d2d1789 100644
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -2,7 +2,7 @@
 from datetime import datetime
 import pandas as pd
 import numpy as np
-from pytrade.util import (
+from pytrading.util import (
     clean_string,
     check_positive_numeric,
     to_datetime,
diff --git a/tests/test_yahoo_events.py b/tests/test_yahoo_events.py
index d0460a7..0b7826c 100644
--- a/tests/test_yahoo_events.py
+++ b/tests/test_yahoo_events.py
@@ -1,8 +1,8 @@
 import pytest
-from pytrade.assets import reset, Stock
-from pytrade.strategy import Strategy
-from pytrade.backtest import Backtest
-from pytrade.events.yahoo import (
+from pytrading.assets import reset, Stock
+from pytrading.strategy import Strategy
+from pytrading.backtest import Backtest
+from pytrading.events.yahoo import (
     load_yahoo_prices,
     YahooAssetLoader,
 )
diff --git a/tox.ini b/tox.ini
index c4d36a6..aca8745 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,8 +3,8 @@ envlist = py35,py36,py37
 
 [testenv]
 commands =
-    pytest --doctest-modules --cov=pytrade --cov-report=html
-    flake8 pytrade
+    pytest --doctest-modules --cov=pytrading --cov-report=html
+    flake8 pytrading
 deps=
     pytest
     pytest-cov