Merge pull request #4551 from RatanShreshtha/3.0

Updated types in __init__.py according to types.py