From 7235aaba401aab853767d5a8249b76469050485a Mon Sep 17 00:00:00 2001
From: Gani Nazirov <ganaziro@microsoft.com>
Date: Fri, 19 Oct 2018 10:01:04 -0700
Subject: [PATCH 1/4] Initial checkin

---
 .gitignore                                    |   1 -
 .vsts-ci.yml                                  |   5 +-
 README.md                                     |   4 +-
 build/ci/phase-template.yml                   |   3 +-
 build/signed_build_phase.yml                  |   4 +-
 docs/README.md                                |   8 +-
 docs/developers/developer-guide.md            |   6 +-
 docs/developers/linux-build.md                |   6 +-
 docs/developers/mac-build.md                  |   4 +-
 docs/developers/windows-build.md              |   4 +-
 docs/project-docs/contributing.md             |   6 +-
 docs/project-docs/style-guide.md              |   4 +-
 src/DotNetBridge/Bridge.cs                    |   2 +-
 src/NativeBridge/dllmain.cpp                  |   8 +-
 src/python/docs/sphinx/concepts/columns.rst   |   4 +-
 .../sphinx/concepts/experimentvspipeline.rst  |   2 +-
 src/python/docs/sphinx/concepts/roles.rst     |   4 +-
 src/python/docs/sphinx/concepts/schema.rst    |   6 +-
 src/python/docs/sphinx/concepts/types.rst     |   4 +-
 src/python/docs/sphinx/index.rst              |  10 +-
 src/python/docs/sphinx/installationguide.rst  |   8 +-
 src/python/docs/sphinx/metrics.rst            |   2 +-
 src/python/docs/sphinx/overview.rst           |   2 +-
 src/python/docs/sphinx/toc.yml                |  18 +-
 src/python/nimbusml.pyproj                    | 316 +++++++++---------
 src/python/nimbusml/__init__.py               |   2 +-
 src/python/nimbusml/__init__.py.in            |   2 +-
 .../nimbusml/{pipeline.py => _pipeline.py}    |   0
 src/python/nimbusml/cluster/__init__.py       |   4 +-
 .../{kmeansplusplus.py => _kmeansplusplus.py} |   2 +-
 .../datasets/{data => _data}/__init__.py      |   0
 .../datasets/{data => _data}/gplv2/COPYING    |   0
 .../{data => _data}/gplv2/airquality.csv      |   0
 .../datasets/{data => _data}/gplv2/infert.csv |   0
 .../test-100.uciadult.sample.csv              |   0
 .../{data => _data}/test-msltr.sample.csv     |   0
 .../{data => _data}/test-ticketchoice.csv     |   0
 .../test-twitter.gen-sample.tsv               |   0
 .../{data => _data}/test.wikipedia.sample.tsv |   0
 .../datasets/{data => _data}/test_fs.csv      |   0
 .../datasets/{data => _data}/timeseries.csv   |   0
 .../datasets/{data => _data}/topics.csv       |   0
 .../train-250.wikipedia.sample.tsv            |   0
 .../train-500.uciadult.sample.csv             |   0
 .../{data => _data}/train-msltr.sample.csv    |   0
 .../{data => _data}/train-ticketchoice.csv    |   0
 .../train-twitter.gen-sample.tsv              |   0
 .../datasets/{data => _data}/train_fs.csv     |   0
 src/python/nimbusml/datasets/datasets.py      |  36 +-
 src/python/nimbusml/decomposition/__init__.py |   7 +-
 ... _factorizationmachinebinaryclassifier.py} |   4 +-
 ...malydetector.py => _pcaanomalydetector.py} |   2 +-
 .../{pcatransformer.py => _pcatransformer.py} |   3 +-
 src/python/nimbusml/ensemble/__init__.py      |  24 +-
 ...fier.py => _fastforestbinaryclassifier.py} |   2 +-
 ...stregressor.py => _fastforestregressor.py} |   2 +-
 ...ifier.py => _fasttreesbinaryclassifier.py} |   2 +-
 ...eesregressor.py => _fasttreesregressor.py} |   2 +-
 ...essor.py => _fasttreestweedieregressor.py} |   2 +-
 ...yclassifier.py => _gambinaryclassifier.py} |   2 +-
 .../{gamregressor.py => _gamregressor.py}     |   2 +-
 ...sifier.py => _lightgbmbinaryclassifier.py} |   2 +-
 ...bmclassifier.py => _lightgbmclassifier.py} |   2 +-
 .../{lightgbmranker.py => _lightgbmranker.py} |   2 +-
 ...tgbmregressor.py => _lightgbmregressor.py} |   2 +-
 .../nimbusml/ensemble/booster/__init__.py     |   7 +-
 .../ensemble/booster/{dart.py => _dart.py}    |   2 +-
 .../ensemble/booster/{gbdt.py => _gbdt.py}    |   2 +-
 .../ensemble/booster/{goss.py => _goss.py}    |   2 +-
 src/python/nimbusml/examples/Sentiment.py     |   2 +-
 .../WordEmbedding_df.py                       |   2 +-
 .../nimbusml/feature_extraction/__init__.py   |   3 +-
 .../{treefeaturizer.py => _treefeaturizer.py} |   2 +-
 .../categorical/__init__.py                   |   7 +-
 ...vectorizer.py => _onehothashvectorizer.py} |   4 +-
 ...ehotvectorizer.py => _onehotvectorizer.py} |   2 +-
 .../feature_extraction/image/__init__.py      |   8 +-
 .../image/{loader.py => _loader.py}           |   2 +-
 .../{pixelextractor.py => _pixelextractor.py} |   2 +-
 .../image/{resizer.py => _resizer.py}         |   2 +-
 .../feature_extraction/text/__init__.py       |   9 +-
 .../text/{lightlda.py => _lightlda.py}        |   2 +-
 ...ngramfeaturizer.py => _ngramfeaturizer.py} |   2 +-
 .../text/{sentiment.py => _sentiment.py}      |   2 +-
 .../{wordembedding.py => _wordembedding.py}   |   2 +-
 .../text/extractor/__init__.py                |   5 +-
 .../text/extractor/{ngram.py => _ngram.py}    |   2 +-
 .../extractor/{ngramhash.py => _ngramhash.py} |   2 +-
 .../text/stopwords/__init__.py                |   5 +-
 ...sremover.py => _customstopwordsremover.py} |   6 +-
 ...over.py => _predefinedstopwordsremover.py} |   6 +-
 .../nimbusml/feature_selection/__init__.py    |   6 +-
 .../{countselector.py => _countselector.py}   |   2 +-
 ...ector.py => _mutualinformationselector.py} |   2 +-
 .../{kmeansplusplus.py => _kmeansplusplus.py} |   0
 ... _factorizationmachinebinaryclassifier.py} |   0
 ...malydetector.py => _pcaanomalydetector.py} |   0
 .../{pcatransformer.py => _pcatransformer.py} |   0
 ...fier.py => _fastforestbinaryclassifier.py} |   0
 ...stregressor.py => _fastforestregressor.py} |   0
 ...ifier.py => _fasttreesbinaryclassifier.py} |   0
 ...eesregressor.py => _fasttreesregressor.py} |   0
 ...essor.py => _fasttreestweedieregressor.py} |   0
 ...yclassifier.py => _gambinaryclassifier.py} |   0
 .../{gamregressor.py => _gamregressor.py}     |   0
 ...sifier.py => _lightgbmbinaryclassifier.py} |   0
 ...bmclassifier.py => _lightgbmclassifier.py} |   0
 .../{lightgbmranker.py => _lightgbmranker.py} |   0
 ...tgbmregressor.py => _lightgbmregressor.py} |   0
 .../ensemble/booster/{dart.py => _dart.py}    |   0
 .../ensemble/booster/{gbdt.py => _gbdt.py}    |   0
 .../ensemble/booster/{goss.py => _goss.py}    |   0
 .../{treefeaturizer.py => _treefeaturizer.py} |   0
 ...vectorizer.py => _onehothashvectorizer.py} |   0
 ...ehotvectorizer.py => _onehotvectorizer.py} |   0
 .../image/{loader.py => _loader.py}           |   0
 .../{pixelextractor.py => _pixelextractor.py} |   0
 .../image/{resizer.py => _resizer.py}         |   0
 .../text/{lightlda.py => _lightlda.py}        |   0
 ...ngramfeaturizer.py => _ngramfeaturizer.py} |   0
 .../text/{sentiment.py => _sentiment.py}      |   0
 .../{wordembedding.py => _wordembedding.py}   |   0
 .../text/extractor/{ngram.py => _ngram.py}    |   0
 .../extractor/{ngramhash.py => _ngramhash.py} |   0
 ...sremover.py => _customstopwordsremover.py} |   0
 ...over.py => _predefinedstopwordsremover.py} |   0
 .../{countselector.py => _countselector.py}   |   0
 ...ector.py => _mutualinformationselector.py} |   0
 ...=> _averagedperceptronbinaryclassifier.py} |   0
 ...fier.py => _fastlinearbinaryclassifier.py} |   0
 ...classifier.py => _fastlinearclassifier.py} |   0
 ...arregressor.py => _fastlinearregressor.py} |   0
 ...=> _logisticregressionbinaryclassifier.py} |   0
 ...er.py => _logisticregressionclassifier.py} |   0
 ....py => _onlinegradientdescentregressor.py} |   0
 ...r.py => _ordinaryleastsquaresregressor.py} |   0
 ...ssor.py => _poissonregressionregressor.py} |   0
 ...yclassifier.py => _sgdbinaryclassifier.py} |   0
 ...assifier.py => _symsgdbinaryclassifier.py} |   0
 .../internal/core/loss/loss_factory.py        |   2 +-
 ...tclassifier.py => _onevsrestclassifier.py} |   0
 ...classifier.py => _naivebayesclassifier.py} |   0
 .../preprocessing/{fromkey.py => _fromkey.py} |   0
 ...nsorflowscorer.py => _tensorflowscorer.py} |   0
 .../preprocessing/{tokey.py => _tokey.py}     |   0
 ...otstrapsampler.py => _bootstrapsampler.py} |   0
 .../{rangefilter.py => _rangefilter.py}       |   0
 .../filter/{skipfilter.py => _skipfilter.py}  |   0
 .../filter/{takefilter.py => _takefilter.py}  |   0
 .../missing_values/{filter.py => _filter.py}  |   0
 .../{handler.py => _handler.py}               |   0
 .../{indicator.py => _indicator.py}           |   0
 .../normalization/{binner.py => _binner.py}   |   0
 ...wscaler.py => _globalcontrastrowscaler.py} |   0
 ...ncescaler.py => _logmeanvariancescaler.py} |   0
 ...riancescaler.py => _meanvariancescaler.py} |   0
 .../{minmaxscaler.py => _minmaxscaler.py}     |   0
 ...concatenator.py => _columnconcatenator.py} |   0
 .../{columndropper.py => _columndropper.py}   |   0
 ...lumnduplicator.py => _columnduplicator.py} |   0
 .../{columnselector.py => _columnselector.py} |   0
 .../{typeconverter.py => _typeconverter.py}   |   0
 .../{chartokenizer.py => _chartokenizer.py}   |   0
 .../nimbusml/internal/utils/data_stream.py    |   2 +-
 .../nimbusml/internal/utils/dataframes.py     |   4 +-
 src/python/nimbusml/linear_model/__init__.py  |  27 +-
 ...=> _averagedperceptronbinaryclassifier.py} |   2 +-
 ...fier.py => _fastlinearbinaryclassifier.py} |   2 +-
 ...classifier.py => _fastlinearclassifier.py} |   2 +-
 ...arregressor.py => _fastlinearregressor.py} |   2 +-
 ...=> _logisticregressionbinaryclassifier.py} |   2 +-
 ...er.py => _logisticregressionclassifier.py} |   2 +-
 ....py => _onlinegradientdescentregressor.py} |   2 +-
 ...r.py => _ordinaryleastsquaresregressor.py} |   2 +-
 ...ssor.py => _poissonregressionregressor.py} |   2 +-
 ...yclassifier.py => _sgdbinaryclassifier.py} |   2 +-
 ...assifier.py => _symsgdbinaryclassifier.py} |   2 +-
 .../nimbusml/model_selection/__init__.py      |   2 +-
 .../model_selection/{cv.py => _cv.py}         |   0
 src/python/nimbusml/multiclass/__init__.py    |   3 +-
 ...tclassifier.py => _onevsrestclassifier.py} |   2 +-
 src/python/nimbusml/naive_bayes/__init__.py   |   4 +-
 ...classifier.py => _naivebayesclassifier.py} |   2 +-
 src/python/nimbusml/preprocessing/__init__.py |   7 +-
 .../preprocessing/{fromkey.py => _fromkey.py} |   2 +-
 ...nsorflowscorer.py => _tensorflowscorer.py} |   2 +-
 .../preprocessing/{tokey.py => _tokey.py}     |   2 +-
 .../nimbusml/preprocessing/filter/__init__.py |   8 +-
 ...otstrapsampler.py => _bootstrapsampler.py} |   2 +-
 .../{rangefilter.py => _rangefilter.py}       |   2 +-
 .../filter/{skipfilter.py => _skipfilter.py}  |   3 +-
 .../filter/{takefilter.py => _takefilter.py}  |   3 +-
 .../preprocessing/missing_values/__init__.py  |   6 +-
 .../missing_values/{filter.py => _filter.py}  |   3 +-
 .../{handler.py => _handler.py}               |   2 +-
 .../{indicator.py => _indicator.py}           |   2 +-
 .../preprocessing/normalization/__init__.py   |  10 +-
 .../normalization/{binner.py => _binner.py}   |   2 +-
 ...wscaler.py => _globalcontrastrowscaler.py} |   2 +-
 ...ncescaler.py => _logmeanvariancescaler.py} |   2 +-
 ...riancescaler.py => _meanvariancescaler.py} |   2 +-
 .../{minmaxscaler.py => _minmaxscaler.py}     |   2 +-
 .../nimbusml/preprocessing/schema/__init__.py |  11 +-
 ...concatenator.py => _columnconcatenator.py} |   2 +-
 .../{columndropper.py => _columndropper.py}   |   2 +-
 ...lumnduplicator.py => _columnduplicator.py} |   2 +-
 .../{columnselector.py => _columnselector.py} |   2 +-
 .../{typeconverter.py => _typeconverter.py}   |   2 +-
 .../nimbusml/preprocessing/text/__init__.py   |   4 +-
 .../{chartokenizer.py => _chartokenizer.py}   |   2 +-
 .../feature_extraction/text/test_sentiment.py |   2 +-
 .../test_symsgdbinaryclassifier.py            |   2 +-
 .../nimbusml/tests/metrics/test_metrics.py    |   6 +-
 .../tests/pipeline/test_score_method.py       |   2 +-
 .../tests/test_syntax_expected_failures.py    |   2 +-
 .../nimbusml/tests/utils/test_exports.py      |   2 +-
 src/python/setup.py                           |   2 +-
 src/python/setup.py.in                        |   2 +-
 src/python/tools/entrypoint_compiler.py       |   2 +-
 src/python/tools/update_nimbusml_version.py   |   2 +-
 220 files changed, 429 insertions(+), 407 deletions(-)
 rename src/python/nimbusml/{pipeline.py => _pipeline.py} (100%)
 rename src/python/nimbusml/cluster/{kmeansplusplus.py => _kmeansplusplus.py} (98%)
 rename src/python/nimbusml/datasets/{data => _data}/__init__.py (100%)
 rename src/python/nimbusml/datasets/{data => _data}/gplv2/COPYING (100%)
 rename src/python/nimbusml/datasets/{data => _data}/gplv2/airquality.csv (100%)
 rename src/python/nimbusml/datasets/{data => _data}/gplv2/infert.csv (100%)
 rename src/python/nimbusml/datasets/{data => _data}/test-100.uciadult.sample.csv (100%)
 rename src/python/nimbusml/datasets/{data => _data}/test-msltr.sample.csv (100%)
 rename src/python/nimbusml/datasets/{data => _data}/test-ticketchoice.csv (100%)
 rename src/python/nimbusml/datasets/{data => _data}/test-twitter.gen-sample.tsv (100%)
 rename src/python/nimbusml/datasets/{data => _data}/test.wikipedia.sample.tsv (100%)
 rename src/python/nimbusml/datasets/{data => _data}/test_fs.csv (100%)
 rename src/python/nimbusml/datasets/{data => _data}/timeseries.csv (100%)
 rename src/python/nimbusml/datasets/{data => _data}/topics.csv (100%)
 rename src/python/nimbusml/datasets/{data => _data}/train-250.wikipedia.sample.tsv (100%)
 rename src/python/nimbusml/datasets/{data => _data}/train-500.uciadult.sample.csv (100%)
 rename src/python/nimbusml/datasets/{data => _data}/train-msltr.sample.csv (100%)
 rename src/python/nimbusml/datasets/{data => _data}/train-ticketchoice.csv (100%)
 rename src/python/nimbusml/datasets/{data => _data}/train-twitter.gen-sample.tsv (100%)
 rename src/python/nimbusml/datasets/{data => _data}/train_fs.csv (100%)
 rename src/python/nimbusml/decomposition/{factorizationmachinebinaryclassifier.py => _factorizationmachinebinaryclassifier.py} (97%)
 rename src/python/nimbusml/decomposition/{pcaanomalydetector.py => _pcaanomalydetector.py} (98%)
 rename src/python/nimbusml/decomposition/{pcatransformer.py => _pcatransformer.py} (98%)
 rename src/python/nimbusml/ensemble/{fastforestbinaryclassifier.py => _fastforestbinaryclassifier.py} (99%)
 rename src/python/nimbusml/ensemble/{fastforestregressor.py => _fastforestregressor.py} (99%)
 rename src/python/nimbusml/ensemble/{fasttreesbinaryclassifier.py => _fasttreesbinaryclassifier.py} (99%)
 rename src/python/nimbusml/ensemble/{fasttreesregressor.py => _fasttreesregressor.py} (99%)
 rename src/python/nimbusml/ensemble/{fasttreestweedieregressor.py => _fasttreestweedieregressor.py} (99%)
 rename src/python/nimbusml/ensemble/{gambinaryclassifier.py => _gambinaryclassifier.py} (99%)
 rename src/python/nimbusml/ensemble/{gamregressor.py => _gamregressor.py} (99%)
 rename src/python/nimbusml/ensemble/{lightgbmbinaryclassifier.py => _lightgbmbinaryclassifier.py} (99%)
 rename src/python/nimbusml/ensemble/{lightgbmclassifier.py => _lightgbmclassifier.py} (99%)
 rename src/python/nimbusml/ensemble/{lightgbmranker.py => _lightgbmranker.py} (99%)
 rename src/python/nimbusml/ensemble/{lightgbmregressor.py => _lightgbmregressor.py} (99%)
 rename src/python/nimbusml/ensemble/booster/{dart.py => _dart.py} (98%)
 rename src/python/nimbusml/ensemble/booster/{gbdt.py => _gbdt.py} (98%)
 rename src/python/nimbusml/ensemble/booster/{goss.py => _goss.py} (98%)
 rename src/python/nimbusml/feature_extraction/{treefeaturizer.py => _treefeaturizer.py} (97%)
 rename src/python/nimbusml/feature_extraction/categorical/{onehothashvectorizer.py => _onehothashvectorizer.py} (97%)
 rename src/python/nimbusml/feature_extraction/categorical/{onehotvectorizer.py => _onehotvectorizer.py} (98%)
 rename src/python/nimbusml/feature_extraction/image/{loader.py => _loader.py} (96%)
 rename src/python/nimbusml/feature_extraction/image/{pixelextractor.py => _pixelextractor.py} (98%)
 rename src/python/nimbusml/feature_extraction/image/{resizer.py => _resizer.py} (97%)
 rename src/python/nimbusml/feature_extraction/text/{lightlda.py => _lightlda.py} (98%)
 rename src/python/nimbusml/feature_extraction/text/{ngramfeaturizer.py => _ngramfeaturizer.py} (99%)
 rename src/python/nimbusml/feature_extraction/text/{sentiment.py => _sentiment.py} (97%)
 rename src/python/nimbusml/feature_extraction/text/{wordembedding.py => _wordembedding.py} (98%)
 rename src/python/nimbusml/feature_extraction/text/extractor/{ngram.py => _ngram.py} (97%)
 rename src/python/nimbusml/feature_extraction/text/extractor/{ngramhash.py => _ngramhash.py} (98%)
 rename src/python/nimbusml/feature_extraction/text/stopwords/{customstopwordsremover.py => _customstopwordsremover.py} (93%)
 rename src/python/nimbusml/feature_extraction/text/stopwords/{predefinedstopwordsremover.py => _predefinedstopwordsremover.py} (92%)
 rename src/python/nimbusml/feature_selection/{countselector.py => _countselector.py} (97%)
 rename src/python/nimbusml/feature_selection/{mutualinformationselector.py => _mutualinformationselector.py} (98%)
 rename src/python/nimbusml/internal/core/cluster/{kmeansplusplus.py => _kmeansplusplus.py} (100%)
 rename src/python/nimbusml/internal/core/decomposition/{factorizationmachinebinaryclassifier.py => _factorizationmachinebinaryclassifier.py} (100%)
 rename src/python/nimbusml/internal/core/decomposition/{pcaanomalydetector.py => _pcaanomalydetector.py} (100%)
 rename src/python/nimbusml/internal/core/decomposition/{pcatransformer.py => _pcatransformer.py} (100%)
 rename src/python/nimbusml/internal/core/ensemble/{fastforestbinaryclassifier.py => _fastforestbinaryclassifier.py} (100%)
 rename src/python/nimbusml/internal/core/ensemble/{fastforestregressor.py => _fastforestregressor.py} (100%)
 rename src/python/nimbusml/internal/core/ensemble/{fasttreesbinaryclassifier.py => _fasttreesbinaryclassifier.py} (100%)
 rename src/python/nimbusml/internal/core/ensemble/{fasttreesregressor.py => _fasttreesregressor.py} (100%)
 rename src/python/nimbusml/internal/core/ensemble/{fasttreestweedieregressor.py => _fasttreestweedieregressor.py} (100%)
 rename src/python/nimbusml/internal/core/ensemble/{gambinaryclassifier.py => _gambinaryclassifier.py} (100%)
 rename src/python/nimbusml/internal/core/ensemble/{gamregressor.py => _gamregressor.py} (100%)
 rename src/python/nimbusml/internal/core/ensemble/{lightgbmbinaryclassifier.py => _lightgbmbinaryclassifier.py} (100%)
 rename src/python/nimbusml/internal/core/ensemble/{lightgbmclassifier.py => _lightgbmclassifier.py} (100%)
 rename src/python/nimbusml/internal/core/ensemble/{lightgbmranker.py => _lightgbmranker.py} (100%)
 rename src/python/nimbusml/internal/core/ensemble/{lightgbmregressor.py => _lightgbmregressor.py} (100%)
 rename src/python/nimbusml/internal/core/ensemble/booster/{dart.py => _dart.py} (100%)
 rename src/python/nimbusml/internal/core/ensemble/booster/{gbdt.py => _gbdt.py} (100%)
 rename src/python/nimbusml/internal/core/ensemble/booster/{goss.py => _goss.py} (100%)
 rename src/python/nimbusml/internal/core/feature_extraction/{treefeaturizer.py => _treefeaturizer.py} (100%)
 rename src/python/nimbusml/internal/core/feature_extraction/categorical/{onehothashvectorizer.py => _onehothashvectorizer.py} (100%)
 rename src/python/nimbusml/internal/core/feature_extraction/categorical/{onehotvectorizer.py => _onehotvectorizer.py} (100%)
 rename src/python/nimbusml/internal/core/feature_extraction/image/{loader.py => _loader.py} (100%)
 rename src/python/nimbusml/internal/core/feature_extraction/image/{pixelextractor.py => _pixelextractor.py} (100%)
 rename src/python/nimbusml/internal/core/feature_extraction/image/{resizer.py => _resizer.py} (100%)
 rename src/python/nimbusml/internal/core/feature_extraction/text/{lightlda.py => _lightlda.py} (100%)
 rename src/python/nimbusml/internal/core/feature_extraction/text/{ngramfeaturizer.py => _ngramfeaturizer.py} (100%)
 rename src/python/nimbusml/internal/core/feature_extraction/text/{sentiment.py => _sentiment.py} (100%)
 rename src/python/nimbusml/internal/core/feature_extraction/text/{wordembedding.py => _wordembedding.py} (100%)
 rename src/python/nimbusml/internal/core/feature_extraction/text/extractor/{ngram.py => _ngram.py} (100%)
 rename src/python/nimbusml/internal/core/feature_extraction/text/extractor/{ngramhash.py => _ngramhash.py} (100%)
 rename src/python/nimbusml/internal/core/feature_extraction/text/stopwords/{customstopwordsremover.py => _customstopwordsremover.py} (100%)
 rename src/python/nimbusml/internal/core/feature_extraction/text/stopwords/{predefinedstopwordsremover.py => _predefinedstopwordsremover.py} (100%)
 rename src/python/nimbusml/internal/core/feature_selection/{countselector.py => _countselector.py} (100%)
 rename src/python/nimbusml/internal/core/feature_selection/{mutualinformationselector.py => _mutualinformationselector.py} (100%)
 rename src/python/nimbusml/internal/core/linear_model/{averagedperceptronbinaryclassifier.py => _averagedperceptronbinaryclassifier.py} (100%)
 rename src/python/nimbusml/internal/core/linear_model/{fastlinearbinaryclassifier.py => _fastlinearbinaryclassifier.py} (100%)
 rename src/python/nimbusml/internal/core/linear_model/{fastlinearclassifier.py => _fastlinearclassifier.py} (100%)
 rename src/python/nimbusml/internal/core/linear_model/{fastlinearregressor.py => _fastlinearregressor.py} (100%)
 rename src/python/nimbusml/internal/core/linear_model/{logisticregressionbinaryclassifier.py => _logisticregressionbinaryclassifier.py} (100%)
 rename src/python/nimbusml/internal/core/linear_model/{logisticregressionclassifier.py => _logisticregressionclassifier.py} (100%)
 rename src/python/nimbusml/internal/core/linear_model/{onlinegradientdescentregressor.py => _onlinegradientdescentregressor.py} (100%)
 rename src/python/nimbusml/internal/core/linear_model/{ordinaryleastsquaresregressor.py => _ordinaryleastsquaresregressor.py} (100%)
 rename src/python/nimbusml/internal/core/linear_model/{poissonregressionregressor.py => _poissonregressionregressor.py} (100%)
 rename src/python/nimbusml/internal/core/linear_model/{sgdbinaryclassifier.py => _sgdbinaryclassifier.py} (100%)
 rename src/python/nimbusml/internal/core/linear_model/{symsgdbinaryclassifier.py => _symsgdbinaryclassifier.py} (100%)
 rename src/python/nimbusml/internal/core/multiclass/{onevsrestclassifier.py => _onevsrestclassifier.py} (100%)
 rename src/python/nimbusml/internal/core/naive_bayes/{naivebayesclassifier.py => _naivebayesclassifier.py} (100%)
 rename src/python/nimbusml/internal/core/preprocessing/{fromkey.py => _fromkey.py} (100%)
 rename src/python/nimbusml/internal/core/preprocessing/{tensorflowscorer.py => _tensorflowscorer.py} (100%)
 rename src/python/nimbusml/internal/core/preprocessing/{tokey.py => _tokey.py} (100%)
 rename src/python/nimbusml/internal/core/preprocessing/filter/{bootstrapsampler.py => _bootstrapsampler.py} (100%)
 rename src/python/nimbusml/internal/core/preprocessing/filter/{rangefilter.py => _rangefilter.py} (100%)
 rename src/python/nimbusml/internal/core/preprocessing/filter/{skipfilter.py => _skipfilter.py} (100%)
 rename src/python/nimbusml/internal/core/preprocessing/filter/{takefilter.py => _takefilter.py} (100%)
 rename src/python/nimbusml/internal/core/preprocessing/missing_values/{filter.py => _filter.py} (100%)
 rename src/python/nimbusml/internal/core/preprocessing/missing_values/{handler.py => _handler.py} (100%)
 rename src/python/nimbusml/internal/core/preprocessing/missing_values/{indicator.py => _indicator.py} (100%)
 rename src/python/nimbusml/internal/core/preprocessing/normalization/{binner.py => _binner.py} (100%)
 rename src/python/nimbusml/internal/core/preprocessing/normalization/{globalcontrastrowscaler.py => _globalcontrastrowscaler.py} (100%)
 rename src/python/nimbusml/internal/core/preprocessing/normalization/{logmeanvariancescaler.py => _logmeanvariancescaler.py} (100%)
 rename src/python/nimbusml/internal/core/preprocessing/normalization/{meanvariancescaler.py => _meanvariancescaler.py} (100%)
 rename src/python/nimbusml/internal/core/preprocessing/normalization/{minmaxscaler.py => _minmaxscaler.py} (100%)
 rename src/python/nimbusml/internal/core/preprocessing/schema/{columnconcatenator.py => _columnconcatenator.py} (100%)
 rename src/python/nimbusml/internal/core/preprocessing/schema/{columndropper.py => _columndropper.py} (100%)
 rename src/python/nimbusml/internal/core/preprocessing/schema/{columnduplicator.py => _columnduplicator.py} (100%)
 rename src/python/nimbusml/internal/core/preprocessing/schema/{columnselector.py => _columnselector.py} (100%)
 rename src/python/nimbusml/internal/core/preprocessing/schema/{typeconverter.py => _typeconverter.py} (100%)
 rename src/python/nimbusml/internal/core/preprocessing/text/{chartokenizer.py => _chartokenizer.py} (100%)
 rename src/python/nimbusml/linear_model/{averagedperceptronbinaryclassifier.py => _averagedperceptronbinaryclassifier.py} (99%)
 rename src/python/nimbusml/linear_model/{fastlinearbinaryclassifier.py => _fastlinearbinaryclassifier.py} (99%)
 rename src/python/nimbusml/linear_model/{fastlinearclassifier.py => _fastlinearclassifier.py} (99%)
 rename src/python/nimbusml/linear_model/{fastlinearregressor.py => _fastlinearregressor.py} (99%)
 rename src/python/nimbusml/linear_model/{logisticregressionbinaryclassifier.py => _logisticregressionbinaryclassifier.py} (99%)
 rename src/python/nimbusml/linear_model/{logisticregressionclassifier.py => _logisticregressionclassifier.py} (99%)
 rename src/python/nimbusml/linear_model/{onlinegradientdescentregressor.py => _onlinegradientdescentregressor.py} (98%)
 rename src/python/nimbusml/linear_model/{ordinaryleastsquaresregressor.py => _ordinaryleastsquaresregressor.py} (98%)
 rename src/python/nimbusml/linear_model/{poissonregressionregressor.py => _poissonregressionregressor.py} (99%)
 rename src/python/nimbusml/linear_model/{sgdbinaryclassifier.py => _sgdbinaryclassifier.py} (99%)
 rename src/python/nimbusml/linear_model/{symsgdbinaryclassifier.py => _symsgdbinaryclassifier.py} (98%)
 rename src/python/nimbusml/model_selection/{cv.py => _cv.py} (100%)
 rename src/python/nimbusml/multiclass/{onevsrestclassifier.py => _onevsrestclassifier.py} (99%)
 rename src/python/nimbusml/naive_bayes/{naivebayesclassifier.py => _naivebayesclassifier.py} (98%)
 rename src/python/nimbusml/preprocessing/{fromkey.py => _fromkey.py} (96%)
 rename src/python/nimbusml/preprocessing/{tensorflowscorer.py => _tensorflowscorer.py} (98%)
 rename src/python/nimbusml/preprocessing/{tokey.py => _tokey.py} (98%)
 rename src/python/nimbusml/preprocessing/filter/{bootstrapsampler.py => _bootstrapsampler.py} (97%)
 rename src/python/nimbusml/preprocessing/filter/{rangefilter.py => _rangefilter.py} (97%)
 rename src/python/nimbusml/preprocessing/filter/{skipfilter.py => _skipfilter.py} (95%)
 rename src/python/nimbusml/preprocessing/filter/{takefilter.py => _takefilter.py} (95%)
 rename src/python/nimbusml/preprocessing/missing_values/{filter.py => _filter.py} (96%)
 rename src/python/nimbusml/preprocessing/missing_values/{handler.py => _handler.py} (98%)
 rename src/python/nimbusml/preprocessing/missing_values/{indicator.py => _indicator.py} (97%)
 rename src/python/nimbusml/preprocessing/normalization/{binner.py => _binner.py} (98%)
 rename src/python/nimbusml/preprocessing/normalization/{globalcontrastrowscaler.py => _globalcontrastrowscaler.py} (98%)
 rename src/python/nimbusml/preprocessing/normalization/{logmeanvariancescaler.py => _logmeanvariancescaler.py} (98%)
 rename src/python/nimbusml/preprocessing/normalization/{meanvariancescaler.py => _meanvariancescaler.py} (98%)
 rename src/python/nimbusml/preprocessing/normalization/{minmaxscaler.py => _minmaxscaler.py} (98%)
 rename src/python/nimbusml/preprocessing/schema/{columnconcatenator.py => _columnconcatenator.py} (97%)
 rename src/python/nimbusml/preprocessing/schema/{columndropper.py => _columndropper.py} (96%)
 rename src/python/nimbusml/preprocessing/schema/{columnduplicator.py => _columnduplicator.py} (97%)
 rename src/python/nimbusml/preprocessing/schema/{columnselector.py => _columnselector.py} (96%)
 rename src/python/nimbusml/preprocessing/schema/{typeconverter.py => _typeconverter.py} (96%)
 rename src/python/nimbusml/preprocessing/text/{chartokenizer.py => _chartokenizer.py} (97%)

diff --git a/.gitignore b/.gitignore
index 45ca6fa4..c0afbf43 100644
--- a/.gitignore
+++ b/.gitignore
@@ -346,4 +346,3 @@ _doc_report.txt
 .pytest_cache/
 data.csv
 data.txt
-
diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index 32fd8737..c7977486 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -28,7 +28,10 @@ phases:
       Py27:
         _configuration: RlsMacPy2.7
     buildQueue:
-      name: Hosted macOS
+      name: RevolutionR
+      timeoutInMinutes: 180
+      demands:
+      - ShipRTag -equals macos-vs2017
 
 # Build all configurations for Linux
   # Run tests on Ubuntu16
diff --git a/README.md b/README.md
index fa805eda..21dc5a39 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ ML.NET was originally developed in Microsoft Research and is used across many pr
 
 This package enables training ML.NET pipelines or integrating ML.NET components directly into Scikit-Learn pipelines (it supports  `numpy.ndarray`, `scipy.sparse_cst`, and `pandas.DataFrame` as inputs).
 
-Documentation can be found [here](https://docs.microsoft.com/en-us/NimbusML/overview) with additional [notebook samples](https://github.com/Microsoft/NimbusML-Samples).
+Documentation can be found [here](https://docs.microsoft.com/en-us/nimbusml/overview) with additional [notebook samples](https://github.com/Microsoft/ML.NET-for-Python-Samples).
 
 ## Installation
 
@@ -53,7 +53,7 @@ results = pipeline.predict(data)
 
 
 
-Many additional examples and tutorials can be found in the [documentation](https://docs.microsoft.com/en-us/NimbusML/overview).
+Many additional examples and tutorials can be found in the [documentation](https://docs.microsoft.com/en-us/nimbusml/overview).
 
 
 ## Building
diff --git a/build/ci/phase-template.yml b/build/ci/phase-template.yml
index 58022807..40962628 100644
--- a/build/ci/phase-template.yml
+++ b/build/ci/phase-template.yml
@@ -24,7 +24,6 @@ phases:
     - script: $(_buildScript) --configuration $(_configuration) --runTests
   # Mac phases
   - ${{ if eq(parameters.name, 'Mac') }}:
-    - script: brew install gcc
     - script: chmod 777 $(_buildScript) && $(_buildScript) --configuration $(_configuration) --runTests
   # Linux phases
   - ${{ if ne(parameters.testDistro, '') }}:
@@ -49,5 +48,5 @@ phases:
       displayName: Publish wheel file to VSTS artifacts
       inputs:
         pathToPublish: $(Build.SourcesDirectory)/target
-        artifactName: NimbusML Wheels
+        artifactName: Mlnet Wheels
         artifactType: container
diff --git a/build/signed_build_phase.yml b/build/signed_build_phase.yml
index 9d5288c4..0b29a440 100644
--- a/build/signed_build_phase.yml
+++ b/build/signed_build_phase.yml
@@ -55,7 +55,7 @@ phases:
     displayName: Copy wheel file to Staging Directory in preparation for publishing 
     inputs:
       SourceFolder: $(Build.SourcesDirectory)/target
-      Contents: nimbusml-*.whl
+      Contents: mlnet-*.whl
       TargetFolder: $(Build.StagingDirectory)/artifacts
 
   - task: PublishBuildArtifacts@1
@@ -63,5 +63,5 @@ phases:
     displayName: Publish wheel file to VSTS artifacts
     inputs:
       pathToPublish: $(Build.StagingDirectory)/artifacts
-      artifactName: NimbusML Wheels
+      artifactName: Mlnet Wheels
       artifactType: container
\ No newline at end of file
diff --git a/docs/README.md b/docs/README.md
index fcfb4cb0..eef214ad 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,15 +1,15 @@
 Documents Index
 ===============
 
-Intro to NimbusML
+Intro to mlnet
 ===============
 
-NimbusML provides state-of-the-art ML algorithms, transforms and components, aiming to make them useful for all developers, data scientists, and information workers and helpful in all products, services and devices.
+`mlnet` provides state-of-the-art ML algorithms, transforms and components, aiming to make them useful for all developers, data scientists, and information workers and helpful in all products, services and devices.
 
 Project Docs
 ============
 
-- [API](https://docs.microsoft.com/en-us/nimbusml/overview)
-- [Tutorials](https://docs.microsoft.com/en-us/nimbusml/tutorials)
+- [API](https://docs.microsoft.com/en-us/mlnet/overview)
+- [Tutorials](https://docs.microsoft.com/en-us/mlnet/tutorials)
 - [Developer Guide](developers/developer-guide.md)
 - [Contributing to ML.NET](project-docs/contributing.md)
diff --git a/docs/developers/developer-guide.md b/docs/developers/developer-guide.md
index 83053655..81dd7e7f 100644
--- a/docs/developers/developer-guide.md
+++ b/docs/developers/developer-guide.md
@@ -1,13 +1,13 @@
 Developer Guide
 ===============
 
-NimbusML runs on Windows, Linux, and macOS and supports Python 3.6, 3.5, and 2.7, 64 bit versions only.  It has been tested on Windows 10, MacOS 10.13, Ubuntu 14.04, Ubuntu 16.04, Ubuntu 18.04, CentOS 7, and RHEL 7.
+`mlnet` runs on Windows, Linux, and macOS and supports Python 3.6, 3.5, and 2.7, 64 bit versions only.  It has been tested on Windows 10, MacOS 10.13, Ubuntu 14.04, Ubuntu 16.04, Ubuntu 18.04, CentOS 7, and RHEL 7.
 
 Building the repository
 =======================
 
-The NimbusML repo can be built directly from a terminal or cmd prompt. See the platform-specific build instructions for your dev environment:
+The `mlnet` repo can be built directly from a terminal or cmd prompt. See the platform-specific build instructions for your dev environment:
 
 | [Windows](windows-build.md) | [Linux](linux-build.md) | [Mac](mac-build.md) |
 
-Nimbus official builds are produced in Azure Dev Ops, as specified by the file `.vsts-ci.yml`.
\ No newline at end of file
+`mlnet` official builds are produced in Azure Dev Ops, as specified by the file `.vsts-ci.yml`.
\ No newline at end of file
diff --git a/docs/developers/linux-build.md b/docs/developers/linux-build.md
index 5fb582e5..9e5982c8 100644
--- a/docs/developers/linux-build.md
+++ b/docs/developers/linux-build.md
@@ -1,4 +1,4 @@
-Building NimbusML from source on Linux
+Building `mlnet` from source on Linux
 ==========================================
 ## Prerequisites
 1. gcc >= 5.4
@@ -12,9 +12,9 @@ Building NimbusML from source on Linux
 ## Build
 Run `./build.sh`
 
-This downloads dependencies (.NET SDK, specific versions of Python and Boost), builds native code and managed code, and packages NimbusML into a pip-installable wheel. This produces debug binaries by default, and release versions can be specified by `./build.sh --configuration RlsLinPy3.6` for examle.
+This downloads dependencies (.NET SDK, specific versions of Python and Boost), builds native code and managed code, and packages `mlnet` into a pip-installable wheel. This produces debug binaries by default, and release versions can be specified by `./build.sh --configuration RlsLinPy3.6` for examle.
 
 For additional options including running tests and building components independently, see `./build.sh -h`.
 
 ### Known Issues
-The LightGBM estimator fails on Linux when building from source. The official NimbusML Linux wheel package on Pypi.org has a working version of LightGBM.
\ No newline at end of file
+The LightGBM estimator fails on Linux when building from source. The official `mlnet` Linux wheel package on Pypi.org has a working version of LightGBM.
\ No newline at end of file
diff --git a/docs/developers/mac-build.md b/docs/developers/mac-build.md
index f2e8b637..eec81b7d 100644
--- a/docs/developers/mac-build.md
+++ b/docs/developers/mac-build.md
@@ -1,4 +1,4 @@
-Building NimbusML from source on Mac
+Building `mlnet` from source on Mac
 ==========================================
 ## Prerequisites
 1. Xcode Command Line Tools (for Clang compiler)
@@ -7,7 +7,7 @@ Building NimbusML from source on Mac
 ## Build
 Run `./build.sh`
 
-This downloads dependencies (.NET SDK, specific versions of Python and Boost), builds native code and managed code, and packages NimbusML into a pip-installable wheel. This produces debug binaries by default, and release versions can be specified by `./build.sh --configuration RlsMacPy3.6` for examle.
+This downloads dependencies (.NET SDK, specific versions of Python and Boost), builds native code and managed code, and packages `mlnet` into a pip-installable wheel. This produces debug binaries by default, and release versions can be specified by `./build.sh --configuration RlsMacPy3.6` for examle.
 
 For additional options including running tests and building components independently, see `./build.sh -h`.
 
diff --git a/docs/developers/windows-build.md b/docs/developers/windows-build.md
index 40dfd602..a247bf6e 100644
--- a/docs/developers/windows-build.md
+++ b/docs/developers/windows-build.md
@@ -1,4 +1,4 @@
-Building NimbusML from source on Windows
+Building `mlnet` from source on Windows
 ==========================================
 ## Prerequisites
 1. Visual Studio 2015 or higher
@@ -7,6 +7,6 @@ Building NimbusML from source on Windows
 ## Build
 Run `build.cmd`
 
-This downloads dependencies (.NET SDK, specific versions of Python and Boost), builds native code and managed code, and packages NimbusML into a pip-installable wheel. This produces debug binaries by default, and release versions can be specified by `build.cmd --configuration RlsWinPy3.6` for examle.
+This downloads dependencies (.NET SDK, specific versions of Python and Boost), builds native code and managed code, and packages `mlnet` into a pip-installable wheel. This produces debug binaries by default, and release versions can be specified by `build.cmd --configuration RlsWinPy3.6` for examle.
 
 For additional options including running tests and building components independently, see `build.cmd -?`.
diff --git a/docs/project-docs/contributing.md b/docs/project-docs/contributing.md
index c6aa83a6..55897725 100644
--- a/docs/project-docs/contributing.md
+++ b/docs/project-docs/contributing.md
@@ -1,14 +1,14 @@
 # Welcome!
 
-If you are here, it means you are interested in helping us out. A hearty welcome and thank you! There are many ways you can contribute to the NimbusML project:
+If you are here, it means you are interested in helping us out. A hearty welcome and thank you! There are many ways you can contribute to the `mlnet` project:
 
 * Offer PRs to fix bugs or implement new features.
 * Give us feedback and bug reports regarding the software or the documentation.
 * Improve our examples, tutorials, and documentation.
 
-### NimbusML and ML.NET
+### mlnet and ML.NET
 
-NimbusML provides Python bindings for the [ML.NET](https://www.microsoft.com/net/learn/apps/machine-learning-and-ai/ml-dotnet) library of machine learning algorithms. If you would like to contribute to the underlying library of algorithms, please check out [ML.NET](https://www.microsoft.com/net/learn/apps/machine-learning-and-ai/ml-dotnet).  If you would like to contribute to the NimbusML python bindings project, please read on.
+`mlnet` provides Python bindings for the [ML.NET](https://www.microsoft.com/net/learn/apps/machine-learning-and-ai/ml-dotnet) library of machine learning algorithms. If you would like to contribute to the underlying library of algorithms, please check out [ML.NET](https://www.microsoft.com/net/learn/apps/machine-learning-and-ai/ml-dotnet).  If you would like to contribute to the `mlnet` python bindings project, please read on.
 
 ## New Contributers
 
diff --git a/docs/project-docs/style-guide.md b/docs/project-docs/style-guide.md
index 5aeab21f..64a77372 100644
--- a/docs/project-docs/style-guide.md
+++ b/docs/project-docs/style-guide.md
@@ -1,12 +1,12 @@
 Contributing to Machine Learning
 ======================
 
-This document describes contribution guidelines that are specific to NimbusML. Please read [Python Style Guide](https://www.python.org/dev/peps/pep-0008/) for more general Python style guidelines.
+This document describes contribution guidelines that are specific to `mlnet`. Please read [Python Style Guide](https://www.python.org/dev/peps/pep-0008/) for more general Python style guidelines.
 
 Coding Style Changes
 --------------------
 
-We intend to bring NimbusML into full conformance with the style guidelines described in [Python Style Guide](https://www.python.org/dev/peps/pep-0008/). We plan to do that with tooling, in a holistic way. In the meantime, please:
+We intend to bring `mlnet` into full conformance with the style guidelines described in [Python Style Guide](https://www.python.org/dev/peps/pep-0008/). We plan to do that with tooling, in a holistic way. In the meantime, please:
 
 * **DO NOT** send PRs for style changes. For example, do not send PRs that are focused on changing usage of ```Int32``` to ```int```.
 * **DO NOT** send PRs for upgrading code to use newer language features, though it's ok to use newer language features as part of new code that's written.  For example, it's ok to use expression-bodied members as part of new code you write, but do not send a PR focused on changing existing properties or methods to use the feature.
diff --git a/src/DotNetBridge/Bridge.cs b/src/DotNetBridge/Bridge.cs
index e72c20b9..64326c5e 100644
--- a/src/DotNetBridge/Bridge.cs
+++ b/src/DotNetBridge/Bridge.cs
@@ -310,7 +310,7 @@ private static unsafe int GenericExec(EnvironmentBlock* penv, sbyte* psz, int cd
             using (var env = new RmlEnvironment(MarshalDelegate<CheckCancelled>(penv->checkCancel), penv->seed,
                     verbose: penv != null && penv->verbosity > 3, conc: penv != null ? penv->maxThreadsAllowed : 0))
             {
-                var host = env.Register("ML.NET_Execution");
+                var host = env.Register("MlNetExecution");
                 env.ComponentCatalog.RegisterAssembly(typeof(TextLoader).Assembly); // ML.Data
                 env.ComponentCatalog.RegisterAssembly(typeof(LinearPredictor).Assembly); // ML.StandardLearners
                 env.ComponentCatalog.RegisterAssembly(typeof(CategoricalTransform).Assembly); // ML.Transforms
diff --git a/src/NativeBridge/dllmain.cpp b/src/NativeBridge/dllmain.cpp
index 9965fe7b..526e4aaf 100644
--- a/src/NativeBridge/dllmain.cpp
+++ b/src/NativeBridge/dllmain.cpp
@@ -9,7 +9,7 @@
 #define PARAM_SEED "seed"
 #define PARAM_GRAPH "graph"
 #define PARAM_VERBOSE "verbose"
-#define PARAM_NIMBUSML_PATH "nimbusmlPath"
+#define PARAM_MLNET_PATH "nimbusmlPath"
 #define PARAM_DATA "data"
 
 #define WIN_FOLDER L"\\Win"
@@ -70,13 +70,13 @@ bp::dict pxCall(bp::dict& params)
 	try
 	{
 		bp::extract<std::string> graph(params[PARAM_GRAPH]);
-		bp::extract<std::string> nimbusmlPath(params[PARAM_NIMBUSML_PATH]);
+		bp::extract<std::string> nimbusmlPath(params[PARAM_MLNET_PATH]);
 		bp::extract<std::int32_t> verbose(params[PARAM_VERBOSE]);
 		std::int32_t i_verbose = std::int32_t(verbose);
 		std::string s_nimbusmlPath = std::string(nimbusmlPath);
 		std::string s_graph = std::string(graph);
-		const char *path = s_nimbusmlPath.c_str();
-		const char *coreclrpath = s_nimbusmlPath.c_str();
+		const char *path = s_nimbusmlPath.c_str();  // nimbusmlPath
+		const char *coreclrpath = s_nimbusmlPath.c_str();  // mlnet core clr
 
 		GENERICEXEC exec = EnsureExec(path, coreclrpath);
 		if (exec == nullptr)
diff --git a/src/python/docs/sphinx/concepts/columns.rst b/src/python/docs/sphinx/concepts/columns.rst
index ca051494..55959964 100644
--- a/src/python/docs/sphinx/concepts/columns.rst
+++ b/src/python/docs/sphinx/concepts/columns.rst
@@ -17,7 +17,7 @@ How To Select Columns to Transform
 ``transform()`` and ``fit_transform()`` methods of trainers and transforms. By default, all
 columns are transformed equally.
 
-NimbusML additionally provides a syntax to transform only a subset of columns. This is a useful
+``nimbusml`` additionally provides a syntax to transform only a subset of columns. This is a useful
 feature for many transforms, especially when the dataset containts columns of mixed types. For
 example, a dataset with both numeric features and free text features. Similarly for trainers, the
 concept of :ref:`roles` provides a mechanism to select which columns to use as labels and features.
@@ -55,7 +55,7 @@ What if we only want to encode one of the columns? We simply use the ``<<`` oper
 transform to restrict operations to the columns of interest. The ``<<`` operatator is syntactic
 sugar for setting the ``columns`` argument of the transform.
 
-All transforms in NimbusML have an implicit ``columns`` parameter to tell which columns to process,
+All transforms in ``nimbusml`` have an implicit ``columns`` parameter to tell which columns to process,
 and optionally how to name the output columns, if any. Refer to the reference sections for each
 transform to see what format is allowed for the ``columns`` argument.
 
diff --git a/src/python/docs/sphinx/concepts/experimentvspipeline.rst b/src/python/docs/sphinx/concepts/experimentvspipeline.rst
index c0e3116c..25510a01 100644
--- a/src/python/docs/sphinx/concepts/experimentvspipeline.rst
+++ b/src/python/docs/sphinx/concepts/experimentvspipeline.rst
@@ -64,7 +64,7 @@ operations.
 Optimized Chaining of Trainers/Transforms
 """""""""""""""""""""""""""""""""""""""""
 
-Using NimbusML, trainers and transforms within a :py:class:`nimbusml.Pipeline` will
+Using ``nimbusml``, trainers and transforms within a :py:class:`nimbusml.Pipeline` will
 generally result in better performance compared to using them in a
 `sklearn.Pipeline <http://scikit-learn.org/stable/modules/generated/sklearn.pipeline.Pipeline.html>`_.
 Data copying is minimized when processing is limited to within the C# libraries, and if all
diff --git a/src/python/docs/sphinx/concepts/roles.rst b/src/python/docs/sphinx/concepts/roles.rst
index c76330f4..daea4334 100644
--- a/src/python/docs/sphinx/concepts/roles.rst
+++ b/src/python/docs/sphinx/concepts/roles.rst
@@ -14,7 +14,7 @@ Column Roles for Trainers
 Roles and Learners
 ------------------
 
-Columns play different roles in the context of trainers. NimbusML supports the following roles, as defined in :py:class:`nimbusml.Role`
+Columns play different roles in the context of trainers. ``nimbusml`` supports the following roles, as defined in :py:class:`nimbusml.Role`
 
 * Role.Label - the column representing the dependent variable.
 * Role.Feature - the column(s) representing the independent variable(s).
@@ -126,7 +126,7 @@ Example of GroupId Role
 
 Same goes for the group. Rankers needs the GroupId to link rows to rank. A ranker for search engine needs a
 dataset with a row per displayed result. The GroupId is ued to tell the learner which results belong to the
-same query, to group together the candidate set of documents for a single query. NimbusML needs features,
+same query, to group together the candidate set of documents for a single query. ``nimbusml`` needs features,
 a target (relevance label of the result) and a GroupId.
 
 Below is an example of using GroupId at the trainer.
diff --git a/src/python/docs/sphinx/concepts/schema.rst b/src/python/docs/sphinx/concepts/schema.rst
index 7c67a999..b04b1dde 100644
--- a/src/python/docs/sphinx/concepts/schema.rst
+++ b/src/python/docs/sphinx/concepts/schema.rst
@@ -16,13 +16,13 @@ Schema
 Introduction to Schema
 ----------------------
 
-The NimbusML data framework relies on a schema to understand the column names and mix of column
+The ``nimbusml`` data framework relies on a schema to understand the column names and mix of column
 types in the dataset, which may originate from any of the supported :ref:`datasources`. It is 
 automatically inferred when a :py:class:`nimbusml.FileDataStream` or :py:class:`nimbusml.DataSchema` is created.
 
 Transforms have the ability to operate on subsets of columns in the dataset, as well as alter the
 resulting output schema, which effects other transforms downstream. For users, it would be very useful to 
-understand how NimbusML processes the data in a pipeline for debugging purposes or training the model with :py:class:`nimbusml.FileDataStream`.
+understand how ``nimbusml`` processes the data in a pipeline for debugging purposes or training the model with :py:class:`nimbusml.FileDataStream`.
 
 The schema comes with two formats for its representation, (1) object representation and (2) string format. After generating a :py:class:`nimbusml.FileDataStream`, users can view the 
 object representation of the schema by using ``repr()`` function:
@@ -168,7 +168,7 @@ all of types R8, I8 and TX, with column names *X1*, *X2* and *X3*.
 Example of Schema for a File
 """"""""""""""""""""""""""""""""""""""
 
-The transforms and trainers in NimbusML support various :ref:`datasources` as inputs.
+The transforms and trainers in ``nimbusml`` support various :ref:`datasources` as inputs.
 When the data is in a ``pandas.DataFrame``, the schema is inferred automatically from the
 ``dtype`` of the columns.
 
diff --git a/src/python/docs/sphinx/concepts/types.rst b/src/python/docs/sphinx/concepts/types.rst
index e1d53858..ff60d85c 100644
--- a/src/python/docs/sphinx/concepts/types.rst
+++ b/src/python/docs/sphinx/concepts/types.rst
@@ -15,7 +15,7 @@ Types
 Column Types
 ------------
 
-NimbusML wraps a library written in C#, which is a strongly typed language. Columns of the input data sources are ascribed a type, which is used by
+``nimbusml`` wraps a library written in C#, which is a strongly typed language. Columns of the input data sources are ascribed a type, which is used by
 transforms and trainers to decide if they can operate on that column. Some transforms may only allow
 text data types, while others only numeric. Trainers almost exclusively require the features and
 labels to be of a numeric type.
@@ -41,7 +41,7 @@ VectorType Columns
 A VectorType column contains a vector of values of a homogenous type, and is associated with a
 ``column_name``.
 
-The following table shows how NimbusML processes a dataset:
+The following table shows how ``nimbusml`` processes a dataset:
 
 .. image:: ../_static/images/table_car.png
 The third column is a VectorType column named *Features* with 10 ``slots``. A VectorType column can
diff --git a/src/python/docs/sphinx/index.rst b/src/python/docs/sphinx/index.rst
index f617d28a..2f696abd 100644
--- a/src/python/docs/sphinx/index.rst
+++ b/src/python/docs/sphinx/index.rst
@@ -9,7 +9,7 @@ ML.NET for Python
 Getting Started
 ===============
 
-NimbusML is a Python module that provides experimental Python bindings for [ML.NET](https://www.microsoft.com/net/learn/apps/machine-learning-and-ai/ml-dotnet). 
+``nimbusml`` is a Python module that provides experimental Python bindings for [ML.NET](https://www.microsoft.com/net/learn/apps/machine-learning-and-ai/ml-dotnet). 
 It provides battle-tested state-of-the-art ML algorithms, transforms and components,
 aiming to make them useful for all developers, data scientists, and information
 workers and helpful in all products, services and devices. The components are
@@ -18,21 +18,21 @@ Bing and other teams at Microsoft.
 
 ``nimbusml`` is interoperable with ``scikit-learn`` estimators and transforms, while adding 
 a suite of highly optimized algorithms written in C++ and C# for speed and performance. 
-NimbusML trainers and transforms support the following data structures for the ``fit()`` and ``transform()`` methods:
+``nimbusml`` trainers and transforms support the following data structures for the ``fit()`` and ``transform()`` methods:
 
 * ``numpy.ndarray`` 
 * ``scipy.sparse_cst``
 * ``pandas.DataFrame``.
    
-In addition, NimbusML also supports streaming from files without loading the dataset
+In addition, ``nimbusml`` also supports streaming from files without loading the dataset
 into memory, which allows training on data significantly 
 exceeding memory using [``FileDataStream``](docs-ref-autogen/nimbusml.FileDataStream.yml).
 
-With [``FileDataStream``](docs-ref-autogen/nimbusml.FileDataStream.yml), NimbusML is able to handle
+With [``FileDataStream``](docs-ref-autogen/nimbusml.FileDataStream.yml), ``nimbusml`` is able to handle
 up to **billion** features and **billions** of training examples for select algorithms.
 
 
-NimbusML can be easily used for the following problems:
+``nimbusml`` can be easily used for the following problems:
 
 .. image:: _static/images/examples1.png
       :target: tutorials/1-3.md
diff --git a/src/python/docs/sphinx/installationguide.rst b/src/python/docs/sphinx/installationguide.rst
index 0fd2ea9d..5fc1023c 100644
--- a/src/python/docs/sphinx/installationguide.rst
+++ b/src/python/docs/sphinx/installationguide.rst
@@ -26,7 +26,7 @@ The library requires the following dependencies, which will be installed automat
 Installation 
 -------------
 
-NimbusML can be installed using ``pip``:
+``nimbusml`` can be installed using ``pip``:
 
 .. code-block:: console
 
@@ -41,10 +41,10 @@ For a quick test, please run:
 Building
 --------------------
 
-The NimbusML package can also be built from the `source repo <https://github.com/Microsoft/NimbusML>`_
-on Github. For more details about building and testing, please refer to our `GitHub repo <https://github.com/Microsoft/NimbusML>`_
+The ``nimbusml`` package can also be built from the `source repo <https://github.com/Microsoft/ML.NET-for-Python>`_
+on Github. For more details about building and testing, please refer to our `GitHub repo <https://github.com/Microsoft/ML.NET-for-Python>`_
 
 Contributing
 ------------
 
-This is an open source package and we welcome contributions. The source code for the  NimbusML package is `available in GitHub <https://github.com/Microsoft/NimbusML>`_.
+This is an open source package and we welcome contributions. The source code for the  ``nimbusml`` package is `available in GitHub <https://github.com/Microsoft/ML.NET-for-Python>`_.
diff --git a/src/python/docs/sphinx/metrics.rst b/src/python/docs/sphinx/metrics.rst
index a7fdb94a..44a6559f 100644
--- a/src/python/docs/sphinx/metrics.rst
+++ b/src/python/docs/sphinx/metrics.rst
@@ -57,7 +57,7 @@ This corresponds to evaltype='binary'.
     The computed AUC is defined as the probability that the score
     for a positive example is higher than the score for a negative one
     (see `AucAggregator.cs <https://github.com/dotnet/machinelearning/blob/master/src/Microsoft.ML.Data/Evaluators/AucAggregator.cs#L135>`_
-    in `ML.NET <https://www.microsoft.com/net/learn/apps/machine-learning-and-ai/ml-dotnet>`_).
+    in `ML.net <https://www.microsoft.com/net/learn/apps/machine-learning-and-ai/ml-dotnet>`_).
     This expression is asymptotically equivalent to the area under the curve
     which is what
     `scikit-learn <http://scikit-learn.org/stable/modules/generated/sklearn.metrics.auc.html>`_ computation.
diff --git a/src/python/docs/sphinx/overview.rst b/src/python/docs/sphinx/overview.rst
index 9a1c4171..60a32d91 100644
--- a/src/python/docs/sphinx/overview.rst
+++ b/src/python/docs/sphinx/overview.rst
@@ -2,7 +2,7 @@
 Overview 
 ========
 
-NimbusML provides state-of-the-art ML algorithms, transforms and components,
+``nimbusml`` provides state-of-the-art ML algorithms, transforms and components,
 aiming to make them useful for all developers, data scientists, and information
 workers and helpful in all products, services and devices. The components are
 authored by the team members, as well as numerous contributors from MSR, CISL,
diff --git a/src/python/docs/sphinx/toc.yml b/src/python/docs/sphinx/toc.yml
index 7edbf211..2cbdc1a1 100644
--- a/src/python/docs/sphinx/toc.yml
+++ b/src/python/docs/sphinx/toc.yml
@@ -8,31 +8,31 @@
   - expanded: false
     href: tutorials.md#quick-start
     items:
-    - href: tutorials/A_A-Classification-with-Synthetic-Data.md
+    - href: tutorials/quickstart-nimbusml-python.md
       name: Classification
-    - href: tutorials/A_C-Regression-with-Synthetic-Data.md
+    - href: tutorials/quickstart-nimbusml-python-regression.md
       name: Regression
-    - href: tutorials/A_B-Twitter-Sentiment-1.md
+    - href: tutorials/sentimental-analysis-twitter.md
       name: Sentiment Analysis (Using Pandas)   
     name: Quick Start
   - expanded: false
     href: tutorials.md#important-concept
     items:
-    - href: tutorials/B_A-Fast-Data-Loading-with-Schema-Twitter-Sentiment-2.md
+    - href: tutorials/sentimental-analysis-twitter-loading.md
       name: Streaming Data Loading
-    - href: tutorials/B_B-Syntax-for-Column-Selection-Classification-Using-Flight-Schedule-Data.md
+    - href: tutorials/nimbusml-python-column-selection.md
       name: Column Selection
-    - href: tutorials/B_C-Image-Processing-Clustering.md
+    - href: tutorials/image-clustering.md
       name: Image Processing
-    - href: tutorials/B_D-Working-with-Scikit-Learn-Toolkit-Classification-Using-Wikipedia-Detox-Data.md
+    - href: tutorials/wikipedia-detox-analysis.md
       name: Sentiment Analysis
-    - href: tutorials/B_E-Learning-to-Rank-with-Microsoft-Bing-Data.md
+    - href: tutorials/defining-column-roles.md
       name: Subset Ranking Estimation
     name: Important Concepts
   - expanded: false
     href: tutorials.md#more-examples
     items:
-    - href: tutorials/C_A-Visualize-a-pipeline.md
+    - href: tutorials/pipeline-visualization.md
       name: Pipeline Visualization
     - href: loadsavemodels.md
       name: Loading and Saving Models
diff --git a/src/python/nimbusml.pyproj b/src/python/nimbusml.pyproj
index 0a59ab96..715eb81a 100644
--- a/src/python/nimbusml.pyproj
+++ b/src/python/nimbusml.pyproj
@@ -29,33 +29,33 @@
     <Compile Include="docs\sphinx\conf.py" />
     <Compile Include="nimbusml\base_predictor.py" />
     <Compile Include="nimbusml\base_transform.py" />
-    <Compile Include="nimbusml\cluster\kmeansplusplus.py" />
+    <Compile Include="nimbusml\cluster\_kmeansplusplus.py" />
     <Compile Include="nimbusml\cluster\__init__.py" />
     <Compile Include="nimbusml\datasets\baseline\__init__.py" />
     <Compile Include="nimbusml\datasets\datasets.py" />
-    <Compile Include="nimbusml\datasets\data\__init__.py" />
+    <Compile Include="nimbusml\datasets\_data\__init__.py" />
     <Compile Include="nimbusml\datasets\image.py" />
     <Compile Include="nimbusml\datasets\images\__init__.py" />
     <Compile Include="nimbusml\datasets\__init__.py" />
-    <Compile Include="nimbusml\decomposition\factorizationmachinebinaryclassifier.py" />
-    <Compile Include="nimbusml\decomposition\pcaanomalydetector.py" />
-    <Compile Include="nimbusml\decomposition\pcatransformer.py" />
+    <Compile Include="nimbusml\decomposition\_factorizationmachinebinaryclassifier.py" />
+    <Compile Include="nimbusml\decomposition\_pcaanomalydetector.py" />
+    <Compile Include="nimbusml\decomposition\_pcatransformer.py" />
     <Compile Include="nimbusml\decomposition\__init__.py" />
-    <Compile Include="nimbusml\ensemble\booster\dart.py" />
-    <Compile Include="nimbusml\ensemble\booster\gbdt.py" />
-    <Compile Include="nimbusml\ensemble\booster\goss.py" />
+    <Compile Include="nimbusml\ensemble\booster\_dart.py" />
+    <Compile Include="nimbusml\ensemble\booster\_gbdt.py" />
+    <Compile Include="nimbusml\ensemble\booster\_goss.py" />
     <Compile Include="nimbusml\ensemble\booster\__init__.py" />
-    <Compile Include="nimbusml\ensemble\fastforestbinaryclassifier.py" />
-    <Compile Include="nimbusml\ensemble\fastforestregressor.py" />
-    <Compile Include="nimbusml\ensemble\fasttreesbinaryclassifier.py" />
-    <Compile Include="nimbusml\ensemble\fasttreesregressor.py" />
-    <Compile Include="nimbusml\ensemble\fasttreestweedieregressor.py" />
-    <Compile Include="nimbusml\ensemble\gambinaryclassifier.py" />
-    <Compile Include="nimbusml\ensemble\gamregressor.py" />
-    <Compile Include="nimbusml\ensemble\lightgbmbinaryclassifier.py" />
-    <Compile Include="nimbusml\ensemble\lightgbmclassifier.py" />
-    <Compile Include="nimbusml\ensemble\lightgbmranker.py" />
-    <Compile Include="nimbusml\ensemble\lightgbmregressor.py" />
+    <Compile Include="nimbusml\ensemble\_fastforestbinaryclassifier.py" />
+    <Compile Include="nimbusml\ensemble\_fastforestregressor.py" />
+    <Compile Include="nimbusml\ensemble\_fasttreesbinaryclassifier.py" />
+    <Compile Include="nimbusml\ensemble\_fasttreesregressor.py" />
+    <Compile Include="nimbusml\ensemble\_fasttreestweedieregressor.py" />
+    <Compile Include="nimbusml\ensemble\_gambinaryclassifier.py" />
+    <Compile Include="nimbusml\ensemble\_gamregressor.py" />
+    <Compile Include="nimbusml\ensemble\_lightgbmbinaryclassifier.py" />
+    <Compile Include="nimbusml\ensemble\_lightgbmclassifier.py" />
+    <Compile Include="nimbusml\ensemble\_lightgbmranker.py" />
+    <Compile Include="nimbusml\ensemble\_lightgbmregressor.py" />
     <Compile Include="nimbusml\ensemble\__init__.py" />
     <Compile Include="nimbusml\examples\AveragedPerceptronBinaryClassifier.py" />
     <Compile Include="nimbusml\examples\Binner.py" />
@@ -180,47 +180,47 @@
     <Compile Include="nimbusml\examples\_Load_Save_Models.py" />
     <Compile Include="nimbusml\examples\_Load_Save_Pipeline.py" />
     <Compile Include="nimbusml\examples\_Load_Save_transforms.py" />
-    <Compile Include="nimbusml\feature_extraction\text\extractor\ngram.py" />
-    <Compile Include="nimbusml\feature_extraction\text\extractor\ngramhash.py" />
+    <Compile Include="nimbusml\feature_extraction\text\extractor\_ngram.py" />
+    <Compile Include="nimbusml\feature_extraction\text\extractor\_ngramhash.py" />
     <Compile Include="nimbusml\feature_extraction\text\extractor\__init__.py" />
-    <Compile Include="nimbusml\feature_extraction\text\lightlda.py" />
-    <Compile Include="nimbusml\feature_extraction\text\stopwords\customstopwordsremover.py" />
-    <Compile Include="nimbusml\feature_extraction\text\stopwords\predefinedstopwordsremover.py" />
+    <Compile Include="nimbusml\feature_extraction\text\_lightlda.py" />
+    <Compile Include="nimbusml\feature_extraction\text\stopwords\_customstopwordsremover.py" />
+    <Compile Include="nimbusml\feature_extraction\text\stopwords\_predefinedstopwordsremover.py" />
     <Compile Include="nimbusml\feature_extraction\text\stopwords\__init__.py" />
-    <Compile Include="nimbusml\feature_extraction\treefeaturizer.py" />
-    <Compile Include="nimbusml\internal\core\decomposition\factorizationmachinebinaryclassifier.py" />
-    <Compile Include="nimbusml\internal\core\decomposition\pcaanomalydetector.py" />
-    <Compile Include="nimbusml\internal\core\decomposition\pcatransformer.py" />
+    <Compile Include="nimbusml\feature_extraction\_treefeaturizer.py" />
+    <Compile Include="nimbusml\internal\core\decomposition\_factorizationmachinebinaryclassifier.py" />
+    <Compile Include="nimbusml\internal\core\decomposition\_pcaanomalydetector.py" />
+    <Compile Include="nimbusml\internal\core\decomposition\_pcatransformer.py" />
     <Compile Include="nimbusml\internal\core\decomposition\__init__.py" />
-    <Compile Include="nimbusml\internal\core\ensemble\booster\dart.py" />
-    <Compile Include="nimbusml\internal\core\ensemble\booster\gbdt.py" />
-    <Compile Include="nimbusml\internal\core\ensemble\booster\goss.py" />
+    <Compile Include="nimbusml\internal\core\ensemble\booster\_dart.py" />
+    <Compile Include="nimbusml\internal\core\ensemble\booster\_gbdt.py" />
+    <Compile Include="nimbusml\internal\core\ensemble\booster\_goss.py" />
     <Compile Include="nimbusml\internal\core\ensemble\booster\__init__.py" />
-    <Compile Include="nimbusml\internal\core\ensemble\gambinaryclassifier.py" />
-    <Compile Include="nimbusml\internal\core\ensemble\gamregressor.py" />
-    <Compile Include="nimbusml\internal\core\ensemble\lightgbmranker.py" />
-    <Compile Include="nimbusml\internal\core\feature_extraction\text\extractor\ngram.py" />
-    <Compile Include="nimbusml\internal\core\feature_extraction\text\extractor\ngramhash.py" />
+    <Compile Include="nimbusml\internal\core\ensemble\_gambinaryclassifier.py" />
+    <Compile Include="nimbusml\internal\core\ensemble\_gamregressor.py" />
+    <Compile Include="nimbusml\internal\core\ensemble\_lightgbmranker.py" />
+    <Compile Include="nimbusml\internal\core\feature_extraction\text\extractor\_ngram.py" />
+    <Compile Include="nimbusml\internal\core\feature_extraction\text\extractor\_ngramhash.py" />
     <Compile Include="nimbusml\internal\core\feature_extraction\text\extractor\__init__.py" />
-    <Compile Include="nimbusml\internal\core\feature_extraction\text\lightlda.py" />
-    <Compile Include="nimbusml\internal\core\feature_extraction\text\stopwords\customstopwordsremover.py" />
-    <Compile Include="nimbusml\internal\core\feature_extraction\text\stopwords\predefinedstopwordsremover.py" />
+    <Compile Include="nimbusml\internal\core\feature_extraction\text\_lightlda.py" />
+    <Compile Include="nimbusml\internal\core\feature_extraction\text\stopwords\_customstopwordsremover.py" />
+    <Compile Include="nimbusml\internal\core\feature_extraction\text\stopwords\_predefinedstopwordsremover.py" />
     <Compile Include="nimbusml\internal\core\feature_extraction\text\stopwords\__init__.py" />
-    <Compile Include="nimbusml\internal\core\feature_extraction\treefeaturizer.py" />
-    <Compile Include="nimbusml\internal\core\linear_model\fastlinearclassifier.py" />
-    <Compile Include="nimbusml\internal\core\linear_model\onlinegradientdescentregressor.py" />
-    <Compile Include="nimbusml\internal\core\linear_model\ordinaryleastsquaresregressor.py" />
-    <Compile Include="nimbusml\internal\core\linear_model\poissonregressionregressor.py" />
-    <Compile Include="nimbusml\internal\core\linear_model\symsgdbinaryclassifier.py" />
+    <Compile Include="nimbusml\internal\core\feature_extraction\_treefeaturizer.py" />
+    <Compile Include="nimbusml\internal\core\linear_model\_fastlinearclassifier.py" />
+    <Compile Include="nimbusml\internal\core\linear_model\_onlinegradientdescentregressor.py" />
+    <Compile Include="nimbusml\internal\core\linear_model\_ordinaryleastsquaresregressor.py" />
+    <Compile Include="nimbusml\internal\core\linear_model\_poissonregressionregressor.py" />
+    <Compile Include="nimbusml\internal\core\linear_model\_symsgdbinaryclassifier.py" />
     <Compile Include="nimbusml\internal\core\loss\loss_factory.py" />
     <Compile Include="nimbusml\internal\core\loss\loss_table_json.py" />
     <Compile Include="nimbusml\internal\core\loss\__init__.py" />
-    <Compile Include="nimbusml\internal\core\multiclass\onevsrestclassifier.py" />
+    <Compile Include="nimbusml\internal\core\multiclass\_onevsrestclassifier.py" />
     <Compile Include="nimbusml\internal\core\multiclass\__init__.py" />
-    <Compile Include="nimbusml\internal\core\preprocessing\filter\skipfilter.py" />
-    <Compile Include="nimbusml\internal\core\preprocessing\filter\takefilter.py" />
-    <Compile Include="nimbusml\internal\core\preprocessing\schema\columnduplicator.py" />
-    <Compile Include="nimbusml\internal\core\preprocessing\tensorflowscorer.py" />
+    <Compile Include="nimbusml\internal\core\preprocessing\filter\_skipfilter.py" />
+    <Compile Include="nimbusml\internal\core\preprocessing\filter\_takefilter.py" />
+    <Compile Include="nimbusml\internal\core\preprocessing\schema\_columnduplicator.py" />
+    <Compile Include="nimbusml\internal\core\preprocessing\_tensorflowscorer.py" />
     <Compile Include="nimbusml\internal\entrypoints\data_customtextloader.py" />
     <Compile Include="nimbusml\internal\entrypoints\data_dataviewreference.py" />
     <Compile Include="nimbusml\internal\entrypoints\data_idataviewarrayconverter.py" />
@@ -415,88 +415,88 @@
     <Compile Include="nimbusml\internal\entrypoints\_stopwordsremover_custom.py" />
     <Compile Include="nimbusml\internal\entrypoints\_stopwordsremover_predefined.py" />
     <Compile Include="nimbusml\internal\entrypoints\__init__.py" />
-    <Compile Include="nimbusml\linear_model\fastlinearclassifier.py" />
-    <Compile Include="nimbusml\linear_model\onlinegradientdescentregressor.py" />
-    <Compile Include="nimbusml\linear_model\ordinaryleastsquaresregressor.py" />
-    <Compile Include="nimbusml\linear_model\poissonregressionregressor.py" />
-    <Compile Include="nimbusml\linear_model\symsgdbinaryclassifier.py" />
+    <Compile Include="nimbusml\linear_model\_fastlinearclassifier.py" />
+    <Compile Include="nimbusml\linear_model\_onlinegradientdescentregressor.py" />
+    <Compile Include="nimbusml\linear_model\_ordinaryleastsquaresregressor.py" />
+    <Compile Include="nimbusml\linear_model\_poissonregressionregressor.py" />
+    <Compile Include="nimbusml\linear_model\_symsgdbinaryclassifier.py" />
     <Compile Include="nimbusml\loss.py" />
-    <Compile Include="nimbusml\model_selection\cv.py" />
+    <Compile Include="nimbusml\model_selection\_cv.py" />
     <Compile Include="nimbusml\model_selection\__init__.py" />
-    <Compile Include="nimbusml\multiclass\onevsrestclassifier.py" />
+    <Compile Include="nimbusml\multiclass\_onevsrestclassifier.py" />
     <Compile Include="nimbusml\multiclass\__init__.py" />
-    <Compile Include="nimbusml\feature_extraction\categorical\onehothashvectorizer.py" />
-    <Compile Include="nimbusml\feature_extraction\categorical\onehotvectorizer.py" />
+    <Compile Include="nimbusml\feature_extraction\categorical\_onehothashvectorizer.py" />
+    <Compile Include="nimbusml\feature_extraction\categorical\_onehotvectorizer.py" />
     <Compile Include="nimbusml\feature_extraction\categorical\__init__.py" />
-    <Compile Include="nimbusml\feature_extraction\image\loader.py" />
-    <Compile Include="nimbusml\feature_extraction\image\pixelextractor.py" />
-    <Compile Include="nimbusml\feature_extraction\image\resizer.py" />
+    <Compile Include="nimbusml\feature_extraction\image\_loader.py" />
+    <Compile Include="nimbusml\feature_extraction\image\_pixelextractor.py" />
+    <Compile Include="nimbusml\feature_extraction\image\_resizer.py" />
     <Compile Include="nimbusml\feature_extraction\image\__init__.py" />
-    <Compile Include="nimbusml\feature_extraction\text\ngramfeaturizer.py" />
-    <Compile Include="nimbusml\feature_extraction\text\sentiment.py" />
-    <Compile Include="nimbusml\feature_extraction\text\wordembedding.py" />
+    <Compile Include="nimbusml\feature_extraction\text\_ngramfeaturizer.py" />
+    <Compile Include="nimbusml\feature_extraction\text\_sentiment.py" />
+    <Compile Include="nimbusml\feature_extraction\text\_wordembedding.py" />
     <Compile Include="nimbusml\feature_extraction\text\__init__.py" />
     <Compile Include="nimbusml\feature_extraction\__init__.py" />
-    <Compile Include="nimbusml\feature_selection\countselector.py" />
-    <Compile Include="nimbusml\feature_selection\mutualinformationselector.py" />
+    <Compile Include="nimbusml\feature_selection\_countselector.py" />
+    <Compile Include="nimbusml\feature_selection\_mutualinformationselector.py" />
     <Compile Include="nimbusml\feature_selection\__init__.py" />
     <Compile Include="nimbusml\internal\core\base_pipeline_item.py" />
-    <Compile Include="nimbusml\internal\core\cluster\kmeansplusplus.py" />
+    <Compile Include="nimbusml\internal\core\cluster\_kmeansplusplus.py" />
     <Compile Include="nimbusml\internal\core\cluster\__init__.py" />
-    <Compile Include="nimbusml\internal\core\ensemble\fastforestbinaryclassifier.py" />
-    <Compile Include="nimbusml\internal\core\ensemble\fastforestregressor.py" />
-    <Compile Include="nimbusml\internal\core\ensemble\fasttreesbinaryclassifier.py" />
-    <Compile Include="nimbusml\internal\core\ensemble\fasttreesregressor.py" />
-    <Compile Include="nimbusml\internal\core\ensemble\fasttreestweedieregressor.py" />
-    <Compile Include="nimbusml\internal\core\ensemble\lightgbmbinaryclassifier.py" />
-    <Compile Include="nimbusml\internal\core\ensemble\lightgbmclassifier.py" />
-    <Compile Include="nimbusml\internal\core\ensemble\lightgbmregressor.py" />
+    <Compile Include="nimbusml\internal\core\ensemble\_fastforestbinaryclassifier.py" />
+    <Compile Include="nimbusml\internal\core\ensemble\_fastforestregressor.py" />
+    <Compile Include="nimbusml\internal\core\ensemble\_fasttreesbinaryclassifier.py" />
+    <Compile Include="nimbusml\internal\core\ensemble\_fasttreesregressor.py" />
+    <Compile Include="nimbusml\internal\core\ensemble\_fasttreestweedieregressor.py" />
+    <Compile Include="nimbusml\internal\core\ensemble\_lightgbmbinaryclassifier.py" />
+    <Compile Include="nimbusml\internal\core\ensemble\_lightgbmclassifier.py" />
+    <Compile Include="nimbusml\internal\core\ensemble\_lightgbmregressor.py" />
     <Compile Include="nimbusml\internal\core\ensemble\__init__.py" />
-    <Compile Include="nimbusml\internal\core\feature_extraction\categorical\onehothashvectorizer.py" />
-    <Compile Include="nimbusml\internal\core\feature_extraction\categorical\onehotvectorizer.py" />
+    <Compile Include="nimbusml\internal\core\feature_extraction\categorical\_onehothashvectorizer.py" />
+    <Compile Include="nimbusml\internal\core\feature_extraction\categorical\_onehotvectorizer.py" />
     <Compile Include="nimbusml\internal\core\feature_extraction\categorical\__init__.py" />
-    <Compile Include="nimbusml\internal\core\feature_extraction\image\loader.py" />
-    <Compile Include="nimbusml\internal\core\feature_extraction\image\pixelextractor.py" />
-    <Compile Include="nimbusml\internal\core\feature_extraction\image\resizer.py" />
+    <Compile Include="nimbusml\internal\core\feature_extraction\image\_loader.py" />
+    <Compile Include="nimbusml\internal\core\feature_extraction\image\_pixelextractor.py" />
+    <Compile Include="nimbusml\internal\core\feature_extraction\image\_resizer.py" />
     <Compile Include="nimbusml\internal\core\feature_extraction\image\__init__.py" />
-    <Compile Include="nimbusml\internal\core\feature_extraction\text\ngramfeaturizer.py" />
-    <Compile Include="nimbusml\internal\core\feature_extraction\text\sentiment.py" />
-    <Compile Include="nimbusml\internal\core\feature_extraction\text\wordembedding.py" />
+    <Compile Include="nimbusml\internal\core\feature_extraction\text\_ngramfeaturizer.py" />
+    <Compile Include="nimbusml\internal\core\feature_extraction\text\_sentiment.py" />
+    <Compile Include="nimbusml\internal\core\feature_extraction\text\_wordembedding.py" />
     <Compile Include="nimbusml\internal\core\feature_extraction\text\__init__.py" />
     <Compile Include="nimbusml\internal\core\feature_extraction\__init__.py" />
-    <Compile Include="nimbusml\internal\core\feature_selection\countselector.py" />
-    <Compile Include="nimbusml\internal\core\feature_selection\mutualinformationselector.py" />
+    <Compile Include="nimbusml\internal\core\feature_selection\_countselector.py" />
+    <Compile Include="nimbusml\internal\core\feature_selection\_mutualinformationselector.py" />
     <Compile Include="nimbusml\internal\core\feature_selection\__init__.py" />
-    <Compile Include="nimbusml\internal\core\linear_model\averagedperceptronbinaryclassifier.py" />
-    <Compile Include="nimbusml\internal\core\linear_model\fastlinearbinaryclassifier.py" />
-    <Compile Include="nimbusml\internal\core\linear_model\fastlinearregressor.py" />
-    <Compile Include="nimbusml\internal\core\linear_model\logisticregressionbinaryclassifier.py" />
-    <Compile Include="nimbusml\internal\core\linear_model\logisticregressionclassifier.py" />
-    <Compile Include="nimbusml\internal\core\linear_model\sgdbinaryclassifier.py" />
+    <Compile Include="nimbusml\internal\core\linear_model\_averagedperceptronbinaryclassifier.py" />
+    <Compile Include="nimbusml\internal\core\linear_model\_fastlinearbinaryclassifier.py" />
+    <Compile Include="nimbusml\internal\core\linear_model\_fastlinearregressor.py" />
+    <Compile Include="nimbusml\internal\core\linear_model\_logisticregressionbinaryclassifier.py" />
+    <Compile Include="nimbusml\internal\core\linear_model\_logisticregressionclassifier.py" />
+    <Compile Include="nimbusml\internal\core\linear_model\_sgdbinaryclassifier.py" />
     <Compile Include="nimbusml\internal\core\linear_model\__init__.py" />
-    <Compile Include="nimbusml\internal\core\naive_bayes\naivebayesclassifier.py" />
+    <Compile Include="nimbusml\internal\core\naive_bayes\_naivebayesclassifier.py" />
     <Compile Include="nimbusml\internal\core\naive_bayes\__init__.py" />
-    <Compile Include="nimbusml\internal\core\preprocessing\filter\bootstrapsampler.py" />
-    <Compile Include="nimbusml\internal\core\preprocessing\filter\rangefilter.py" />
+    <Compile Include="nimbusml\internal\core\preprocessing\filter\_bootstrapsampler.py" />
+    <Compile Include="nimbusml\internal\core\preprocessing\filter\_rangefilter.py" />
     <Compile Include="nimbusml\internal\core\preprocessing\filter\__init__.py" />
-    <Compile Include="nimbusml\internal\core\preprocessing\fromkey.py" />
-    <Compile Include="nimbusml\internal\core\preprocessing\missing_values\filter.py" />
-    <Compile Include="nimbusml\internal\core\preprocessing\missing_values\handler.py" />
-    <Compile Include="nimbusml\internal\core\preprocessing\missing_values\indicator.py" />
+    <Compile Include="nimbusml\internal\core\preprocessing\_fromkey.py" />
+    <Compile Include="nimbusml\internal\core\preprocessing\missing_values\_filter.py" />
+    <Compile Include="nimbusml\internal\core\preprocessing\missing_values\_handler.py" />
+    <Compile Include="nimbusml\internal\core\preprocessing\missing_values\_indicator.py" />
     <Compile Include="nimbusml\internal\core\preprocessing\missing_values\__init__.py" />
-    <Compile Include="nimbusml\internal\core\preprocessing\normalization\binner.py" />
-    <Compile Include="nimbusml\internal\core\preprocessing\normalization\globalcontrastrowscaler.py" />
-    <Compile Include="nimbusml\internal\core\preprocessing\normalization\logmeanvariancescaler.py" />
-    <Compile Include="nimbusml\internal\core\preprocessing\normalization\meanvariancescaler.py" />
-    <Compile Include="nimbusml\internal\core\preprocessing\normalization\minmaxscaler.py" />
+    <Compile Include="nimbusml\internal\core\preprocessing\normalization\_binner.py" />
+    <Compile Include="nimbusml\internal\core\preprocessing\normalization\_globalcontrastrowscaler.py" />
+    <Compile Include="nimbusml\internal\core\preprocessing\normalization\_logmeanvariancescaler.py" />
+    <Compile Include="nimbusml\internal\core\preprocessing\normalization\_meanvariancescaler.py" />
+    <Compile Include="nimbusml\internal\core\preprocessing\normalization\_minmaxscaler.py" />
     <Compile Include="nimbusml\internal\core\preprocessing\normalization\__init__.py" />
-    <Compile Include="nimbusml\internal\core\preprocessing\schema\columnconcatenator.py" />
-    <Compile Include="nimbusml\internal\core\preprocessing\schema\columndropper.py" />
-    <Compile Include="nimbusml\internal\core\preprocessing\schema\columnselector.py" />
-    <Compile Include="nimbusml\internal\core\preprocessing\schema\typeconverter.py" />
+    <Compile Include="nimbusml\internal\core\preprocessing\schema\_columnconcatenator.py" />
+    <Compile Include="nimbusml\internal\core\preprocessing\schema\_columndropper.py" />
+    <Compile Include="nimbusml\internal\core\preprocessing\schema\_columnselector.py" />
+    <Compile Include="nimbusml\internal\core\preprocessing\schema\_typeconverter.py" />
     <Compile Include="nimbusml\internal\core\preprocessing\schema\__init__.py" />
-    <Compile Include="nimbusml\internal\core\preprocessing\tokey.py" />
-    <Compile Include="nimbusml\internal\core\preprocessing\text\chartokenizer.py" />
+    <Compile Include="nimbusml\internal\core\preprocessing\_tokey.py" />
+    <Compile Include="nimbusml\internal\core\preprocessing\text\_chartokenizer.py" />
     <Compile Include="nimbusml\internal\core\preprocessing\text\__init__.py" />
     <Compile Include="nimbusml\internal\core\preprocessing\__init__.py" />
     <Compile Include="nimbusml\internal\core\__init__.py" />
@@ -510,42 +510,42 @@
     <Compile Include="nimbusml\internal\utils\utils.py" />
     <Compile Include="nimbusml\internal\utils\__init__.py" />
     <Compile Include="nimbusml\internal\__init__.py" />
-    <Compile Include="nimbusml\linear_model\averagedperceptronbinaryclassifier.py" />
-    <Compile Include="nimbusml\linear_model\fastlinearbinaryclassifier.py" />
-    <Compile Include="nimbusml\linear_model\fastlinearregressor.py" />
-    <Compile Include="nimbusml\linear_model\logisticregressionbinaryclassifier.py" />
-    <Compile Include="nimbusml\linear_model\logisticregressionclassifier.py" />
-    <Compile Include="nimbusml\linear_model\sgdbinaryclassifier.py" />
+    <Compile Include="nimbusml\linear_model\_averagedperceptronbinaryclassifier.py" />
+    <Compile Include="nimbusml\linear_model\_fastlinearbinaryclassifier.py" />
+    <Compile Include="nimbusml\linear_model\_fastlinearregressor.py" />
+    <Compile Include="nimbusml\linear_model\_logisticregressionbinaryclassifier.py" />
+    <Compile Include="nimbusml\linear_model\_logisticregressionclassifier.py" />
+    <Compile Include="nimbusml\linear_model\_sgdbinaryclassifier.py" />
     <Compile Include="nimbusml\linear_model\__init__.py" />
-    <Compile Include="nimbusml\naive_bayes\naivebayesclassifier.py" />
+    <Compile Include="nimbusml\naive_bayes\_naivebayesclassifier.py" />
     <Compile Include="nimbusml\naive_bayes\__init__.py" />
-    <Compile Include="nimbusml\pipeline.py" />
-    <Compile Include="nimbusml\preprocessing\filter\bootstrapsampler.py" />
-    <Compile Include="nimbusml\preprocessing\filter\rangefilter.py" />
-    <Compile Include="nimbusml\preprocessing\filter\skipfilter.py" />
-    <Compile Include="nimbusml\preprocessing\filter\takefilter.py" />
+    <Compile Include="nimbusml\_pipeline.py" />
+    <Compile Include="nimbusml\preprocessing\filter\_bootstrapsampler.py" />
+    <Compile Include="nimbusml\preprocessing\filter\_rangefilter.py" />
+    <Compile Include="nimbusml\preprocessing\filter\_skipfilter.py" />
+    <Compile Include="nimbusml\preprocessing\filter\_takefilter.py" />
     <Compile Include="nimbusml\preprocessing\filter\__init__.py" />
-    <Compile Include="nimbusml\preprocessing\fromkey.py" />
-    <Compile Include="nimbusml\preprocessing\missing_values\filter.py" />
-    <Compile Include="nimbusml\preprocessing\missing_values\handler.py" />
-    <Compile Include="nimbusml\preprocessing\missing_values\indicator.py" />
+    <Compile Include="nimbusml\preprocessing\_fromkey.py" />
+    <Compile Include="nimbusml\preprocessing\missing_values\_filter.py" />
+    <Compile Include="nimbusml\preprocessing\missing_values\_handler.py" />
+    <Compile Include="nimbusml\preprocessing\missing_values\_indicator.py" />
     <Compile Include="nimbusml\preprocessing\missing_values\__init__.py" />
-    <Compile Include="nimbusml\preprocessing\normalization\binner.py" />
-    <Compile Include="nimbusml\preprocessing\normalization\globalcontrastrowscaler.py" />
-    <Compile Include="nimbusml\preprocessing\normalization\logmeanvariancescaler.py" />
-    <Compile Include="nimbusml\preprocessing\normalization\meanvariancescaler.py" />
-    <Compile Include="nimbusml\preprocessing\normalization\minmaxscaler.py" />
+    <Compile Include="nimbusml\preprocessing\normalization\_binner.py" />
+    <Compile Include="nimbusml\preprocessing\normalization\_globalcontrastrowscaler.py" />
+    <Compile Include="nimbusml\preprocessing\normalization\_logmeanvariancescaler.py" />
+    <Compile Include="nimbusml\preprocessing\normalization\_meanvariancescaler.py" />
+    <Compile Include="nimbusml\preprocessing\normalization\_minmaxscaler.py" />
     <Compile Include="nimbusml\preprocessing\normalization\__init__.py" />
-    <Compile Include="nimbusml\preprocessing\schema\columnconcatenator.py" />
-    <Compile Include="nimbusml\preprocessing\schema\columndropper.py" />
-    <Compile Include="nimbusml\preprocessing\schema\columnduplicator.py" />
-    <Compile Include="nimbusml\preprocessing\schema\columnselector.py" />
-    <Compile Include="nimbusml\preprocessing\schema\typeconverter.py" />
+    <Compile Include="nimbusml\preprocessing\schema\_columnconcatenator.py" />
+    <Compile Include="nimbusml\preprocessing\schema\_columndropper.py" />
+    <Compile Include="nimbusml\preprocessing\schema\_columnduplicator.py" />
+    <Compile Include="nimbusml\preprocessing\schema\_columnselector.py" />
+    <Compile Include="nimbusml\preprocessing\schema\_typeconverter.py" />
     <Compile Include="nimbusml\preprocessing\schema\__init__.py" />
-    <Compile Include="nimbusml\preprocessing\tensorflowscorer.py" />
-    <Compile Include="nimbusml\preprocessing\text\chartokenizer.py" />
+    <Compile Include="nimbusml\preprocessing\_tensorflowscorer.py" />
+    <Compile Include="nimbusml\preprocessing\text\_chartokenizer.py" />
     <Compile Include="nimbusml\preprocessing\text\__init__.py" />
-    <Compile Include="nimbusml\preprocessing\tokey.py" />
+    <Compile Include="nimbusml\preprocessing\_tokey.py" />
     <Compile Include="nimbusml\preprocessing\__init__.py" />
     <Compile Include="nimbusml\tests\cluster\test_kmeansplusplus.py" />
     <Compile Include="nimbusml\tests\cluster\__init__.py" />
@@ -705,8 +705,8 @@
     <Folder Include="nimbusml\cluster\" />
     <Folder Include="nimbusml\datasets\" />
     <Folder Include="nimbusml\datasets\baseline\" />
-    <Folder Include="nimbusml\datasets\data\" />
-    <Folder Include="nimbusml\datasets\data\gplv2\" />
+    <Folder Include="nimbusml\datasets\_data\" />
+    <Folder Include="nimbusml\datasets\_data\gplv2\" />
     <Folder Include="nimbusml\datasets\images\" />
     <Folder Include="nimbusml\decomposition\" />
     <Folder Include="nimbusml\ensemble\" />
@@ -1069,25 +1069,25 @@
     <Content Include="nimbusml\datasets\baseline\featurizeImage_resnet18_output.csv" />
     <Content Include="nimbusml\datasets\baseline\featurizeImage_resnet50_output.csv" />
     <Content Include="nimbusml\datasets\baseline\magic.nn" />
-    <Content Include="nimbusml\datasets\data\gplv2\airquality.csv" />
-    <Content Include="nimbusml\datasets\data\gplv2\COPYING" />
-    <Content Include="nimbusml\datasets\data\gplv2\infert.csv" />
-    <Content Include="nimbusml\datasets\data\test-msltr.sample.csv" />
-    <Content Include="nimbusml\datasets\data\test-ticketchoice.csv" />
-    <Content Include="nimbusml\datasets\data\test-twitter.gen-sample.tsv" />
-    <Content Include="nimbusml\datasets\data\test.wikipedia.sample.tsv" />
-    <Content Include="nimbusml\datasets\data\test_fs.csv" />
-    <Content Include="nimbusml\datasets\data\timeseries.csv" />
-    <Content Include="nimbusml\datasets\data\topics.csv" />
-    <Content Include="nimbusml\datasets\data\train-250.wikipedia.sample.tsv" />
-    <Content Include="nimbusml\datasets\data\train-500.uciadult.sample.csv" />
-    <Content Include="nimbusml\datasets\data\train-msltr.sample.csv" />
-    <Content Include="nimbusml\datasets\data\train-ticketchoice.csv" />
-    <Content Include="nimbusml\datasets\data\train-twitter.gen-sample.tsv" />
-    <Content Include="nimbusml\datasets\data\train_fs.csv" />
+    <Content Include="nimbusml\datasets\_data\gplv2\airquality.csv" />
+    <Content Include="nimbusml\datasets\_data\gplv2\COPYING" />
+    <Content Include="nimbusml\datasets\_data\gplv2\infert.csv" />
+    <Content Include="nimbusml\datasets\_data\test-msltr.sample.csv" />
+    <Content Include="nimbusml\datasets\_data\test-ticketchoice.csv" />
+    <Content Include="nimbusml\datasets\_data\test-twitter.gen-sample.tsv" />
+    <Content Include="nimbusml\datasets\_data\test.wikipedia.sample.tsv" />
+    <Content Include="nimbusml\datasets\_data\test_fs.csv" />
+    <Content Include="nimbusml\datasets\_data\timeseries.csv" />
+    <Content Include="nimbusml\datasets\_data\topics.csv" />
+    <Content Include="nimbusml\datasets\_data\train-250.wikipedia.sample.tsv" />
+    <Content Include="nimbusml\datasets\_data\train-500.uciadult.sample.csv" />
+    <Content Include="nimbusml\datasets\_data\train-msltr.sample.csv" />
+    <Content Include="nimbusml\datasets\_data\train-ticketchoice.csv" />
+    <Content Include="nimbusml\datasets\_data\train-twitter.gen-sample.tsv" />
+    <Content Include="nimbusml\datasets\_data\train_fs.csv" />
     <Content Include="nimbusml\datasets\images\Microsoftlogo.png" />
     <Content Include="nimbusml\datasets\images\RevolutionAnalyticslogo.png" />
-    <Content Include="nimbusml\datasets\data\test-100.uciadult.sample.csv" />
+    <Content Include="nimbusml\datasets\_data\test-100.uciadult.sample.csv" />
     <Content Include="nimbusml\examples\frozen_saved_model.pb" />
     <Content Include="nimbusml\__init__.py.in" />
     <Content Include="README.md" />
diff --git a/src/python/nimbusml/__init__.py b/src/python/nimbusml/__init__.py
index 943abf68..f9f927e9 100644
--- a/src/python/nimbusml/__init__.py
+++ b/src/python/nimbusml/__init__.py
@@ -22,7 +22,7 @@
 from .internal.utils.data_stream import BinaryDataStream
 from .internal.utils.data_stream import FileDataStream
 from .internal.utils.utils import run_tests
-from .pipeline import Pipeline
+from ._pipeline import Pipeline
 
 if sys.platform.lower() == "linux":
     pkg_path = os.path.dirname(os.path.realpath(__file__))
diff --git a/src/python/nimbusml/__init__.py.in b/src/python/nimbusml/__init__.py.in
index 4837bb22..e9cb7c67 100644
--- a/src/python/nimbusml/__init__.py.in
+++ b/src/python/nimbusml/__init__.py.in
@@ -22,7 +22,7 @@ from .internal.utils.data_schema import DataSchema
 from .internal.utils.data_stream import BinaryDataStream
 from .internal.utils.data_stream import FileDataStream
 from .internal.utils.utils import run_tests
-from .pipeline import Pipeline
+from ._pipeline import Pipeline
 
 if sys.platform.lower() == "linux":
     pkg_path = os.path.dirname(os.path.realpath(__file__))
diff --git a/src/python/nimbusml/pipeline.py b/src/python/nimbusml/_pipeline.py
similarity index 100%
rename from src/python/nimbusml/pipeline.py
rename to src/python/nimbusml/_pipeline.py
diff --git a/src/python/nimbusml/cluster/__init__.py b/src/python/nimbusml/cluster/__init__.py
index 13cda025..ea2b1e26 100644
--- a/src/python/nimbusml/cluster/__init__.py
+++ b/src/python/nimbusml/cluster/__init__.py
@@ -1,5 +1,5 @@
-from .kmeansplusplus import KMeansPlusPlus
+from ._kmeansplusplus import KMeansPlusPlus
 
 __all__ = [
     'KMeansPlusPlus'
-]
+]
\ No newline at end of file
diff --git a/src/python/nimbusml/cluster/kmeansplusplus.py b/src/python/nimbusml/cluster/_kmeansplusplus.py
similarity index 98%
rename from src/python/nimbusml/cluster/kmeansplusplus.py
rename to src/python/nimbusml/cluster/_kmeansplusplus.py
index f35d8c49..7b9ab64e 100644
--- a/src/python/nimbusml/cluster/kmeansplusplus.py
+++ b/src/python/nimbusml/cluster/_kmeansplusplus.py
@@ -13,7 +13,7 @@
 from sklearn.base import ClusterMixin
 
 from ..base_predictor import BasePredictor
-from ..internal.core.cluster.kmeansplusplus import KMeansPlusPlus as core
+from ..internal.core.cluster._kmeansplusplus import KMeansPlusPlus as core
 from ..internal.utils.utils import trace
 
 
diff --git a/src/python/nimbusml/datasets/data/__init__.py b/src/python/nimbusml/datasets/_data/__init__.py
similarity index 100%
rename from src/python/nimbusml/datasets/data/__init__.py
rename to src/python/nimbusml/datasets/_data/__init__.py
diff --git a/src/python/nimbusml/datasets/data/gplv2/COPYING b/src/python/nimbusml/datasets/_data/gplv2/COPYING
similarity index 100%
rename from src/python/nimbusml/datasets/data/gplv2/COPYING
rename to src/python/nimbusml/datasets/_data/gplv2/COPYING
diff --git a/src/python/nimbusml/datasets/data/gplv2/airquality.csv b/src/python/nimbusml/datasets/_data/gplv2/airquality.csv
similarity index 100%
rename from src/python/nimbusml/datasets/data/gplv2/airquality.csv
rename to src/python/nimbusml/datasets/_data/gplv2/airquality.csv
diff --git a/src/python/nimbusml/datasets/data/gplv2/infert.csv b/src/python/nimbusml/datasets/_data/gplv2/infert.csv
similarity index 100%
rename from src/python/nimbusml/datasets/data/gplv2/infert.csv
rename to src/python/nimbusml/datasets/_data/gplv2/infert.csv
diff --git a/src/python/nimbusml/datasets/data/test-100.uciadult.sample.csv b/src/python/nimbusml/datasets/_data/test-100.uciadult.sample.csv
similarity index 100%
rename from src/python/nimbusml/datasets/data/test-100.uciadult.sample.csv
rename to src/python/nimbusml/datasets/_data/test-100.uciadult.sample.csv
diff --git a/src/python/nimbusml/datasets/data/test-msltr.sample.csv b/src/python/nimbusml/datasets/_data/test-msltr.sample.csv
similarity index 100%
rename from src/python/nimbusml/datasets/data/test-msltr.sample.csv
rename to src/python/nimbusml/datasets/_data/test-msltr.sample.csv
diff --git a/src/python/nimbusml/datasets/data/test-ticketchoice.csv b/src/python/nimbusml/datasets/_data/test-ticketchoice.csv
similarity index 100%
rename from src/python/nimbusml/datasets/data/test-ticketchoice.csv
rename to src/python/nimbusml/datasets/_data/test-ticketchoice.csv
diff --git a/src/python/nimbusml/datasets/data/test-twitter.gen-sample.tsv b/src/python/nimbusml/datasets/_data/test-twitter.gen-sample.tsv
similarity index 100%
rename from src/python/nimbusml/datasets/data/test-twitter.gen-sample.tsv
rename to src/python/nimbusml/datasets/_data/test-twitter.gen-sample.tsv
diff --git a/src/python/nimbusml/datasets/data/test.wikipedia.sample.tsv b/src/python/nimbusml/datasets/_data/test.wikipedia.sample.tsv
similarity index 100%
rename from src/python/nimbusml/datasets/data/test.wikipedia.sample.tsv
rename to src/python/nimbusml/datasets/_data/test.wikipedia.sample.tsv
diff --git a/src/python/nimbusml/datasets/data/test_fs.csv b/src/python/nimbusml/datasets/_data/test_fs.csv
similarity index 100%
rename from src/python/nimbusml/datasets/data/test_fs.csv
rename to src/python/nimbusml/datasets/_data/test_fs.csv
diff --git a/src/python/nimbusml/datasets/data/timeseries.csv b/src/python/nimbusml/datasets/_data/timeseries.csv
similarity index 100%
rename from src/python/nimbusml/datasets/data/timeseries.csv
rename to src/python/nimbusml/datasets/_data/timeseries.csv
diff --git a/src/python/nimbusml/datasets/data/topics.csv b/src/python/nimbusml/datasets/_data/topics.csv
similarity index 100%
rename from src/python/nimbusml/datasets/data/topics.csv
rename to src/python/nimbusml/datasets/_data/topics.csv
diff --git a/src/python/nimbusml/datasets/data/train-250.wikipedia.sample.tsv b/src/python/nimbusml/datasets/_data/train-250.wikipedia.sample.tsv
similarity index 100%
rename from src/python/nimbusml/datasets/data/train-250.wikipedia.sample.tsv
rename to src/python/nimbusml/datasets/_data/train-250.wikipedia.sample.tsv
diff --git a/src/python/nimbusml/datasets/data/train-500.uciadult.sample.csv b/src/python/nimbusml/datasets/_data/train-500.uciadult.sample.csv
similarity index 100%
rename from src/python/nimbusml/datasets/data/train-500.uciadult.sample.csv
rename to src/python/nimbusml/datasets/_data/train-500.uciadult.sample.csv
diff --git a/src/python/nimbusml/datasets/data/train-msltr.sample.csv b/src/python/nimbusml/datasets/_data/train-msltr.sample.csv
similarity index 100%
rename from src/python/nimbusml/datasets/data/train-msltr.sample.csv
rename to src/python/nimbusml/datasets/_data/train-msltr.sample.csv
diff --git a/src/python/nimbusml/datasets/data/train-ticketchoice.csv b/src/python/nimbusml/datasets/_data/train-ticketchoice.csv
similarity index 100%
rename from src/python/nimbusml/datasets/data/train-ticketchoice.csv
rename to src/python/nimbusml/datasets/_data/train-ticketchoice.csv
diff --git a/src/python/nimbusml/datasets/data/train-twitter.gen-sample.tsv b/src/python/nimbusml/datasets/_data/train-twitter.gen-sample.tsv
similarity index 100%
rename from src/python/nimbusml/datasets/data/train-twitter.gen-sample.tsv
rename to src/python/nimbusml/datasets/_data/train-twitter.gen-sample.tsv
diff --git a/src/python/nimbusml/datasets/data/train_fs.csv b/src/python/nimbusml/datasets/_data/train_fs.csv
similarity index 100%
rename from src/python/nimbusml/datasets/data/train_fs.csv
rename to src/python/nimbusml/datasets/_data/train_fs.csv
diff --git a/src/python/nimbusml/datasets/datasets.py b/src/python/nimbusml/datasets/datasets.py
index 9cb85145..8e8cd8a2 100644
--- a/src/python/nimbusml/datasets/datasets.py
+++ b/src/python/nimbusml/datasets/datasets.py
@@ -177,7 +177,7 @@ def load(self):
             # pooled.stratum
             this = os.path.join(
                 os.path.dirname(__file__),
-                "data",
+                "_data",
                 "gplv2",
                 "infert.csv")
             self.__dict__['_data'] = pandas.read_csv(this)
@@ -231,7 +231,7 @@ def as_filepath(self):
         """
         return os.path.join(
             os.path.dirname(__file__),
-            "data",
+            "_data",
             "gplv2",
             "infert.csv")
 
@@ -264,7 +264,7 @@ def load(self):
             # pooled.stratum
             this = os.path.join(
                 os.path.dirname(__file__),
-                "data",
+                "_data",
                 "gplv2",
                 "airquality.csv")
             self.__dict__['_data'] = pandas.read_csv(this)
@@ -296,7 +296,7 @@ def as_filepath(self):
         """
         return os.path.join(
             os.path.dirname(__file__),
-            "data",
+            "_data",
             "gplv2",
             "airquality.csv")
 
@@ -324,7 +324,7 @@ def as_filepath(self):
         """
         Return file name.
         """
-        return os.path.join(os.path.dirname(__file__), "data",
+        return os.path.join(os.path.dirname(__file__), "_data",
                             "topics.csv")
 
 
@@ -353,7 +353,7 @@ def as_filepath(self):
         """
         return os.path.join(
             os.path.dirname(__file__),
-            "data",
+            "_data",
             "timeseries.csv")
 
 
@@ -381,7 +381,7 @@ def as_filepath(self):
         """
         return os.path.join(
             os.path.dirname(__file__),
-            "data",
+            "_data",
             "train-250.wikipedia.sample.tsv")
 
 
@@ -409,7 +409,7 @@ def as_filepath(self):
         """
         return os.path.join(
             os.path.dirname(__file__),
-            "data",
+            "_data",
             "test.wikipedia.sample.tsv")
 
 
@@ -437,7 +437,7 @@ def as_filepath(self):
         """
         return os.path.join(
             os.path.dirname(__file__),
-            "data",
+            "_data",
             "train_fs.csv")
 
 
@@ -465,7 +465,7 @@ def as_filepath(self):
         """
         return os.path.join(
             os.path.dirname(__file__),
-            "data",
+            "_data",
             "test_fs.csv")
 
 
@@ -494,7 +494,7 @@ def as_filepath(self):
         """
         return os.path.join(
             os.path.dirname(__file__),
-            "data",
+            "_data",
             "train-msltr.sample.csv")
 
 
@@ -523,7 +523,7 @@ def as_filepath(self):
         """
         return os.path.join(
             os.path.dirname(__file__),
-            "data",
+            "_data",
             "test-msltr.sample.csv")
 
 
@@ -550,7 +550,7 @@ def as_filepath(self):
         """
         return os.path.join(
             os.path.dirname(__file__),
-            "data",
+            "_data",
             "train-500.uciadult.sample.csv")
 
 
@@ -577,7 +577,7 @@ def as_filepath(self):
         """
         return os.path.join(
             os.path.dirname(__file__),
-            "data",
+            "_data",
             "test-100.uciadult.sample.csv")
 
 
@@ -605,7 +605,7 @@ def as_filepath(self):
         """
         return os.path.join(
             os.path.dirname(__file__),
-            "data",
+            "_data",
             "train-twitter.gen-sample.tsv")
 
 
@@ -633,7 +633,7 @@ def as_filepath(self):
         """
         return os.path.join(
             os.path.dirname(__file__),
-            "data",
+            "_data",
             "test-twitter.gen-sample.tsv")
 
 
@@ -661,7 +661,7 @@ def as_filepath(self):
         """
         return os.path.join(
             os.path.dirname(__file__),
-            "data",
+            "_data",
             "train-ticketchoice.csv")
 
 
@@ -689,7 +689,7 @@ def as_filepath(self):
         """
         return os.path.join(
             os.path.dirname(__file__),
-            "data",
+            "_data",
             "test-ticketchoice.csv")
 
 
diff --git a/src/python/nimbusml/decomposition/__init__.py b/src/python/nimbusml/decomposition/__init__.py
index 7beb252f..c859c41d 100644
--- a/src/python/nimbusml/decomposition/__init__.py
+++ b/src/python/nimbusml/decomposition/__init__.py
@@ -1,7 +1,6 @@
-from .factorizationmachinebinaryclassifier import \
-    FactorizationMachineBinaryClassifier
-from .pcaanomalydetector import PcaAnomalyDetector
-from .pcatransformer import PcaTransformer
+from ._factorizationmachinebinaryclassifier import FactorizationMachineBinaryClassifier
+from ._pcaanomalydetector import PcaAnomalyDetector
+from ._pcatransformer import PcaTransformer
 
 __all__ = [
     'FactorizationMachineBinaryClassifier',
diff --git a/src/python/nimbusml/decomposition/factorizationmachinebinaryclassifier.py b/src/python/nimbusml/decomposition/_factorizationmachinebinaryclassifier.py
similarity index 97%
rename from src/python/nimbusml/decomposition/factorizationmachinebinaryclassifier.py
rename to src/python/nimbusml/decomposition/_factorizationmachinebinaryclassifier.py
index 7382dd10..fd103ad9 100644
--- a/src/python/nimbusml/decomposition/factorizationmachinebinaryclassifier.py
+++ b/src/python/nimbusml/decomposition/_factorizationmachinebinaryclassifier.py
@@ -13,8 +13,8 @@
 from sklearn.base import ClassifierMixin
 
 from ..base_predictor import BasePredictor
-from ..internal.core.decomposition.factorizationmachinebinaryclassifier \
-    import FactorizationMachineBinaryClassifier as core
+from ..internal.core.decomposition._factorizationmachinebinaryclassifier import \
+    FactorizationMachineBinaryClassifier as core
 from ..internal.utils.utils import trace
 
 
diff --git a/src/python/nimbusml/decomposition/pcaanomalydetector.py b/src/python/nimbusml/decomposition/_pcaanomalydetector.py
similarity index 98%
rename from src/python/nimbusml/decomposition/pcaanomalydetector.py
rename to src/python/nimbusml/decomposition/_pcaanomalydetector.py
index 57b21b90..544bb3b6 100644
--- a/src/python/nimbusml/decomposition/pcaanomalydetector.py
+++ b/src/python/nimbusml/decomposition/_pcaanomalydetector.py
@@ -13,7 +13,7 @@
 from sklearn.base import ClassifierMixin
 
 from ..base_predictor import BasePredictor
-from ..internal.core.decomposition.pcaanomalydetector import \
+from ..internal.core.decomposition._pcaanomalydetector import \
     PcaAnomalyDetector as core
 from ..internal.utils.utils import trace
 
diff --git a/src/python/nimbusml/decomposition/pcatransformer.py b/src/python/nimbusml/decomposition/_pcatransformer.py
similarity index 98%
rename from src/python/nimbusml/decomposition/pcatransformer.py
rename to src/python/nimbusml/decomposition/_pcatransformer.py
index 7ddb6326..c21b5925 100644
--- a/src/python/nimbusml/decomposition/pcatransformer.py
+++ b/src/python/nimbusml/decomposition/_pcatransformer.py
@@ -13,7 +13,8 @@
 from sklearn.base import TransformerMixin
 
 from ..base_transform import BaseTransform
-from ..internal.core.decomposition.pcatransformer import PcaTransformer as core
+from ..internal.core.decomposition._pcatransformer import \
+    PcaTransformer as core
 from ..internal.utils.utils import trace
 
 
diff --git a/src/python/nimbusml/ensemble/__init__.py b/src/python/nimbusml/ensemble/__init__.py
index b4934efa..04c555f8 100644
--- a/src/python/nimbusml/ensemble/__init__.py
+++ b/src/python/nimbusml/ensemble/__init__.py
@@ -1,14 +1,14 @@
-from .fastforestbinaryclassifier import FastForestBinaryClassifier
-from .fastforestregressor import FastForestRegressor
-from .fasttreesbinaryclassifier import FastTreesBinaryClassifier
-from .fasttreesregressor import FastTreesRegressor
-from .fasttreestweedieregressor import FastTreesTweedieRegressor
-from .gambinaryclassifier import GamBinaryClassifier
-from .gamregressor import GamRegressor
-from .lightgbmbinaryclassifier import LightGbmBinaryClassifier
-from .lightgbmclassifier import LightGbmClassifier
-from .lightgbmranker import LightGbmRanker
-from .lightgbmregressor import LightGbmRegressor
+from ._fastforestbinaryclassifier import FastForestBinaryClassifier
+from ._fastforestregressor import FastForestRegressor
+from ._fasttreesbinaryclassifier import FastTreesBinaryClassifier
+from ._fasttreesregressor import FastTreesRegressor
+from ._fasttreestweedieregressor import FastTreesTweedieRegressor
+from ._gambinaryclassifier import GamBinaryClassifier
+from ._gamregressor import GamRegressor
+from ._lightgbmbinaryclassifier import LightGbmBinaryClassifier
+from ._lightgbmclassifier import LightGbmClassifier
+from ._lightgbmranker import LightGbmRanker
+from ._lightgbmregressor import LightGbmRegressor
 
 __all__ = [
     'FastForestBinaryClassifier',
@@ -23,3 +23,5 @@
     'LightGbmRanker',
     'LightGbmRegressor'
 ]
+
+
diff --git a/src/python/nimbusml/ensemble/fastforestbinaryclassifier.py b/src/python/nimbusml/ensemble/_fastforestbinaryclassifier.py
similarity index 99%
rename from src/python/nimbusml/ensemble/fastforestbinaryclassifier.py
rename to src/python/nimbusml/ensemble/_fastforestbinaryclassifier.py
index 09c7677f..29a43b71 100644
--- a/src/python/nimbusml/ensemble/fastforestbinaryclassifier.py
+++ b/src/python/nimbusml/ensemble/_fastforestbinaryclassifier.py
@@ -13,7 +13,7 @@
 from sklearn.base import ClassifierMixin
 
 from ..base_predictor import BasePredictor
-from ..internal.core.ensemble.fastforestbinaryclassifier import \
+from ..internal.core.ensemble._fastforestbinaryclassifier import \
     FastForestBinaryClassifier as core
 from ..internal.utils.utils import trace
 
diff --git a/src/python/nimbusml/ensemble/fastforestregressor.py b/src/python/nimbusml/ensemble/_fastforestregressor.py
similarity index 99%
rename from src/python/nimbusml/ensemble/fastforestregressor.py
rename to src/python/nimbusml/ensemble/_fastforestregressor.py
index 9255d953..ca330d5e 100644
--- a/src/python/nimbusml/ensemble/fastforestregressor.py
+++ b/src/python/nimbusml/ensemble/_fastforestregressor.py
@@ -13,7 +13,7 @@
 from sklearn.base import RegressorMixin
 
 from ..base_predictor import BasePredictor
-from ..internal.core.ensemble.fastforestregressor import \
+from ..internal.core.ensemble._fastforestregressor import \
     FastForestRegressor as core
 from ..internal.utils.utils import trace
 
diff --git a/src/python/nimbusml/ensemble/fasttreesbinaryclassifier.py b/src/python/nimbusml/ensemble/_fasttreesbinaryclassifier.py
similarity index 99%
rename from src/python/nimbusml/ensemble/fasttreesbinaryclassifier.py
rename to src/python/nimbusml/ensemble/_fasttreesbinaryclassifier.py
index 7989a1e9..06009f71 100644
--- a/src/python/nimbusml/ensemble/fasttreesbinaryclassifier.py
+++ b/src/python/nimbusml/ensemble/_fasttreesbinaryclassifier.py
@@ -13,7 +13,7 @@
 from sklearn.base import ClassifierMixin
 
 from ..base_predictor import BasePredictor
-from ..internal.core.ensemble.fasttreesbinaryclassifier import \
+from ..internal.core.ensemble._fasttreesbinaryclassifier import \
     FastTreesBinaryClassifier as core
 from ..internal.utils.utils import trace
 
diff --git a/src/python/nimbusml/ensemble/fasttreesregressor.py b/src/python/nimbusml/ensemble/_fasttreesregressor.py
similarity index 99%
rename from src/python/nimbusml/ensemble/fasttreesregressor.py
rename to src/python/nimbusml/ensemble/_fasttreesregressor.py
index 3a55bb4c..b5d3cd3b 100644
--- a/src/python/nimbusml/ensemble/fasttreesregressor.py
+++ b/src/python/nimbusml/ensemble/_fasttreesregressor.py
@@ -13,7 +13,7 @@
 from sklearn.base import RegressorMixin
 
 from ..base_predictor import BasePredictor
-from ..internal.core.ensemble.fasttreesregressor import \
+from ..internal.core.ensemble._fasttreesregressor import \
     FastTreesRegressor as core
 from ..internal.utils.utils import trace
 
diff --git a/src/python/nimbusml/ensemble/fasttreestweedieregressor.py b/src/python/nimbusml/ensemble/_fasttreestweedieregressor.py
similarity index 99%
rename from src/python/nimbusml/ensemble/fasttreestweedieregressor.py
rename to src/python/nimbusml/ensemble/_fasttreestweedieregressor.py
index e9ac1750..0f0308b9 100644
--- a/src/python/nimbusml/ensemble/fasttreestweedieregressor.py
+++ b/src/python/nimbusml/ensemble/_fasttreestweedieregressor.py
@@ -13,7 +13,7 @@
 from sklearn.base import RegressorMixin
 
 from ..base_predictor import BasePredictor
-from ..internal.core.ensemble.fasttreestweedieregressor import \
+from ..internal.core.ensemble._fasttreestweedieregressor import \
     FastTreesTweedieRegressor as core
 from ..internal.utils.utils import trace
 
diff --git a/src/python/nimbusml/ensemble/gambinaryclassifier.py b/src/python/nimbusml/ensemble/_gambinaryclassifier.py
similarity index 99%
rename from src/python/nimbusml/ensemble/gambinaryclassifier.py
rename to src/python/nimbusml/ensemble/_gambinaryclassifier.py
index 2427c2ba..8e791440 100644
--- a/src/python/nimbusml/ensemble/gambinaryclassifier.py
+++ b/src/python/nimbusml/ensemble/_gambinaryclassifier.py
@@ -13,7 +13,7 @@
 from sklearn.base import ClassifierMixin
 
 from ..base_predictor import BasePredictor
-from ..internal.core.ensemble.gambinaryclassifier import \
+from ..internal.core.ensemble._gambinaryclassifier import \
     GamBinaryClassifier as core
 from ..internal.utils.utils import trace
 
diff --git a/src/python/nimbusml/ensemble/gamregressor.py b/src/python/nimbusml/ensemble/_gamregressor.py
similarity index 99%
rename from src/python/nimbusml/ensemble/gamregressor.py
rename to src/python/nimbusml/ensemble/_gamregressor.py
index 13587cd8..3043721b 100644
--- a/src/python/nimbusml/ensemble/gamregressor.py
+++ b/src/python/nimbusml/ensemble/_gamregressor.py
@@ -13,7 +13,7 @@
 from sklearn.base import RegressorMixin
 
 from ..base_predictor import BasePredictor
-from ..internal.core.ensemble.gamregressor import GamRegressor as core
+from ..internal.core.ensemble._gamregressor import GamRegressor as core
 from ..internal.utils.utils import trace
 
 
diff --git a/src/python/nimbusml/ensemble/lightgbmbinaryclassifier.py b/src/python/nimbusml/ensemble/_lightgbmbinaryclassifier.py
similarity index 99%
rename from src/python/nimbusml/ensemble/lightgbmbinaryclassifier.py
rename to src/python/nimbusml/ensemble/_lightgbmbinaryclassifier.py
index 8f0d3673..93de3f83 100644
--- a/src/python/nimbusml/ensemble/lightgbmbinaryclassifier.py
+++ b/src/python/nimbusml/ensemble/_lightgbmbinaryclassifier.py
@@ -13,7 +13,7 @@
 from sklearn.base import ClassifierMixin
 
 from ..base_predictor import BasePredictor
-from ..internal.core.ensemble.lightgbmbinaryclassifier import \
+from ..internal.core.ensemble._lightgbmbinaryclassifier import \
     LightGbmBinaryClassifier as core
 from ..internal.utils.utils import trace
 
diff --git a/src/python/nimbusml/ensemble/lightgbmclassifier.py b/src/python/nimbusml/ensemble/_lightgbmclassifier.py
similarity index 99%
rename from src/python/nimbusml/ensemble/lightgbmclassifier.py
rename to src/python/nimbusml/ensemble/_lightgbmclassifier.py
index a8e56eaf..806edad9 100644
--- a/src/python/nimbusml/ensemble/lightgbmclassifier.py
+++ b/src/python/nimbusml/ensemble/_lightgbmclassifier.py
@@ -13,7 +13,7 @@
 from sklearn.base import ClassifierMixin
 
 from ..base_predictor import BasePredictor
-from ..internal.core.ensemble.lightgbmclassifier import \
+from ..internal.core.ensemble._lightgbmclassifier import \
     LightGbmClassifier as core
 from ..internal.utils.utils import trace
 
diff --git a/src/python/nimbusml/ensemble/lightgbmranker.py b/src/python/nimbusml/ensemble/_lightgbmranker.py
similarity index 99%
rename from src/python/nimbusml/ensemble/lightgbmranker.py
rename to src/python/nimbusml/ensemble/_lightgbmranker.py
index 890b4de0..f2796ac0 100644
--- a/src/python/nimbusml/ensemble/lightgbmranker.py
+++ b/src/python/nimbusml/ensemble/_lightgbmranker.py
@@ -13,7 +13,7 @@
 from sklearn.base import ClassifierMixin
 
 from ..base_predictor import BasePredictor
-from ..internal.core.ensemble.lightgbmranker import LightGbmRanker as core
+from ..internal.core.ensemble._lightgbmranker import LightGbmRanker as core
 from ..internal.utils.utils import trace
 
 
diff --git a/src/python/nimbusml/ensemble/lightgbmregressor.py b/src/python/nimbusml/ensemble/_lightgbmregressor.py
similarity index 99%
rename from src/python/nimbusml/ensemble/lightgbmregressor.py
rename to src/python/nimbusml/ensemble/_lightgbmregressor.py
index 8ad088c4..d6ff81c7 100644
--- a/src/python/nimbusml/ensemble/lightgbmregressor.py
+++ b/src/python/nimbusml/ensemble/_lightgbmregressor.py
@@ -13,7 +13,7 @@
 from sklearn.base import RegressorMixin
 
 from ..base_predictor import BasePredictor
-from ..internal.core.ensemble.lightgbmregressor import \
+from ..internal.core.ensemble._lightgbmregressor import \
     LightGbmRegressor as core
 from ..internal.utils.utils import trace
 
diff --git a/src/python/nimbusml/ensemble/booster/__init__.py b/src/python/nimbusml/ensemble/booster/__init__.py
index 91cf250a..608a2eca 100644
--- a/src/python/nimbusml/ensemble/booster/__init__.py
+++ b/src/python/nimbusml/ensemble/booster/__init__.py
@@ -1,9 +1,10 @@
-from .dart import Dart
-from .gbdt import Gbdt
-from .goss import Goss
+from ._dart import Dart
+from ._gbdt import Gbdt
+from ._goss import Goss
 
 __all__ = [
     'Dart',
     'Gbdt',
     'Goss'
 ]
+
diff --git a/src/python/nimbusml/ensemble/booster/dart.py b/src/python/nimbusml/ensemble/booster/_dart.py
similarity index 98%
rename from src/python/nimbusml/ensemble/booster/dart.py
rename to src/python/nimbusml/ensemble/booster/_dart.py
index a4536a2e..4bc0bd6b 100644
--- a/src/python/nimbusml/ensemble/booster/dart.py
+++ b/src/python/nimbusml/ensemble/booster/_dart.py
@@ -10,7 +10,7 @@
 __all__ = ["Dart"]
 
 
-from ...internal.core.ensemble.booster.dart import Dart as core
+from ...internal.core.ensemble.booster._dart import Dart as core
 from ...internal.utils.utils import trace
 
 
diff --git a/src/python/nimbusml/ensemble/booster/gbdt.py b/src/python/nimbusml/ensemble/booster/_gbdt.py
similarity index 98%
rename from src/python/nimbusml/ensemble/booster/gbdt.py
rename to src/python/nimbusml/ensemble/booster/_gbdt.py
index ba69c9e2..aa16289b 100644
--- a/src/python/nimbusml/ensemble/booster/gbdt.py
+++ b/src/python/nimbusml/ensemble/booster/_gbdt.py
@@ -10,7 +10,7 @@
 __all__ = ["Gbdt"]
 
 
-from ...internal.core.ensemble.booster.gbdt import Gbdt as core
+from ...internal.core.ensemble.booster._gbdt import Gbdt as core
 from ...internal.utils.utils import trace
 
 
diff --git a/src/python/nimbusml/ensemble/booster/goss.py b/src/python/nimbusml/ensemble/booster/_goss.py
similarity index 98%
rename from src/python/nimbusml/ensemble/booster/goss.py
rename to src/python/nimbusml/ensemble/booster/_goss.py
index 64863766..8da24823 100644
--- a/src/python/nimbusml/ensemble/booster/goss.py
+++ b/src/python/nimbusml/ensemble/booster/_goss.py
@@ -10,7 +10,7 @@
 __all__ = ["Goss"]
 
 
-from ...internal.core.ensemble.booster.goss import Goss as core
+from ...internal.core.ensemble.booster._goss import Goss as core
 from ...internal.utils.utils import trace
 
 
diff --git a/src/python/nimbusml/examples/Sentiment.py b/src/python/nimbusml/examples/Sentiment.py
index d7de049a..171960eb 100644
--- a/src/python/nimbusml/examples/Sentiment.py
+++ b/src/python/nimbusml/examples/Sentiment.py
@@ -19,7 +19,7 @@
 # No need to fit any real data, just a dummy call to fit() to ensure the
 # column name 'review' is present when transform() is invoked
 
-# Skip until ML.NET resolve the resouce issue with Sentiment transform
+# Skip until ML.Net resolve the resouce issue with Sentiment transform
 # y = analyze.fit_transform(customer_reviews)
 
 # View the sentiment scores!!
diff --git a/src/python/nimbusml/examples/examples_from_dataframe/WordEmbedding_df.py b/src/python/nimbusml/examples/examples_from_dataframe/WordEmbedding_df.py
index 320eaa6d..abc06385 100644
--- a/src/python/nimbusml/examples/examples_from_dataframe/WordEmbedding_df.py
+++ b/src/python/nimbusml/examples/examples_from_dataframe/WordEmbedding_df.py
@@ -3,7 +3,7 @@
 import pandas
 from nimbusml import Pipeline
 from nimbusml.feature_extraction.text import WordEmbedding
-from nimbusml.feature_extraction.text.ngramfeaturizer import NGramFeaturizer
+from nimbusml.feature_extraction.text import NGramFeaturizer
 from nimbusml.feature_extraction.text.extractor import Ngram
 
 # create the data
diff --git a/src/python/nimbusml/feature_extraction/__init__.py b/src/python/nimbusml/feature_extraction/__init__.py
index 18ea3694..d7f47ac0 100644
--- a/src/python/nimbusml/feature_extraction/__init__.py
+++ b/src/python/nimbusml/feature_extraction/__init__.py
@@ -1,5 +1,6 @@
-from .treefeaturizer import TreeFeaturizer
+from ._treefeaturizer import TreeFeaturizer
 
 __all__ = [
     'TreeFeaturizer'
 ]
+
diff --git a/src/python/nimbusml/feature_extraction/treefeaturizer.py b/src/python/nimbusml/feature_extraction/_treefeaturizer.py
similarity index 97%
rename from src/python/nimbusml/feature_extraction/treefeaturizer.py
rename to src/python/nimbusml/feature_extraction/_treefeaturizer.py
index 1b12fe35..a3ccd111 100644
--- a/src/python/nimbusml/feature_extraction/treefeaturizer.py
+++ b/src/python/nimbusml/feature_extraction/_treefeaturizer.py
@@ -13,7 +13,7 @@
 from sklearn.base import TransformerMixin
 
 from ..base_transform import BaseTransform
-from ..internal.core.feature_extraction.treefeaturizer import \
+from ..internal.core.feature_extraction._treefeaturizer import \
     TreeFeaturizer as core
 from ..internal.utils.utils import trace
 
diff --git a/src/python/nimbusml/feature_extraction/categorical/__init__.py b/src/python/nimbusml/feature_extraction/categorical/__init__.py
index 6e3ee58a..cd5239c0 100644
--- a/src/python/nimbusml/feature_extraction/categorical/__init__.py
+++ b/src/python/nimbusml/feature_extraction/categorical/__init__.py
@@ -1,7 +1,10 @@
-from .onehothashvectorizer import OneHotHashVectorizer
-from .onehotvectorizer import OneHotVectorizer
+from ._onehothashvectorizer import OneHotHashVectorizer
+from ._onehotvectorizer import OneHotVectorizer
+
 
 __all__ = [
     'OneHotHashVectorizer',
     'OneHotVectorizer'
 ]
+
+
diff --git a/src/python/nimbusml/feature_extraction/categorical/onehothashvectorizer.py b/src/python/nimbusml/feature_extraction/categorical/_onehothashvectorizer.py
similarity index 97%
rename from src/python/nimbusml/feature_extraction/categorical/onehothashvectorizer.py
rename to src/python/nimbusml/feature_extraction/categorical/_onehothashvectorizer.py
index 501ac7b8..d2bba455 100644
--- a/src/python/nimbusml/feature_extraction/categorical/onehothashvectorizer.py
+++ b/src/python/nimbusml/feature_extraction/categorical/_onehothashvectorizer.py
@@ -13,8 +13,8 @@
 from sklearn.base import TransformerMixin
 
 from ...base_transform import BaseTransform
-from ...internal.core.feature_extraction.categorical.onehothashvectorizer \
-    import OneHotHashVectorizer as core
+from ...internal.core.feature_extraction.categorical._onehothashvectorizer import \
+    OneHotHashVectorizer as core
 from ...internal.utils.utils import trace
 
 
diff --git a/src/python/nimbusml/feature_extraction/categorical/onehotvectorizer.py b/src/python/nimbusml/feature_extraction/categorical/_onehotvectorizer.py
similarity index 98%
rename from src/python/nimbusml/feature_extraction/categorical/onehotvectorizer.py
rename to src/python/nimbusml/feature_extraction/categorical/_onehotvectorizer.py
index bca0fa5b..7da2e4a8 100644
--- a/src/python/nimbusml/feature_extraction/categorical/onehotvectorizer.py
+++ b/src/python/nimbusml/feature_extraction/categorical/_onehotvectorizer.py
@@ -13,7 +13,7 @@
 from sklearn.base import TransformerMixin
 
 from ...base_transform import BaseTransform
-from ...internal.core.feature_extraction.categorical.onehotvectorizer import \
+from ...internal.core.feature_extraction.categorical._onehotvectorizer import \
     OneHotVectorizer as core
 from ...internal.utils.utils import trace
 
diff --git a/src/python/nimbusml/feature_extraction/image/__init__.py b/src/python/nimbusml/feature_extraction/image/__init__.py
index 05a3deed..96a3ed4c 100644
--- a/src/python/nimbusml/feature_extraction/image/__init__.py
+++ b/src/python/nimbusml/feature_extraction/image/__init__.py
@@ -1,9 +1,11 @@
-from .loader import Loader
-from .pixelextractor import PixelExtractor
-from .resizer import Resizer
+from ._loader import Loader
+from ._pixelextractor import PixelExtractor
+from ._resizer import Resizer
 
 __all__ = [
     'Loader',
     'PixelExtractor',
     'Resizer'
 ]
+
+
diff --git a/src/python/nimbusml/feature_extraction/image/loader.py b/src/python/nimbusml/feature_extraction/image/_loader.py
similarity index 96%
rename from src/python/nimbusml/feature_extraction/image/loader.py
rename to src/python/nimbusml/feature_extraction/image/_loader.py
index bd93a080..c5bc6625 100644
--- a/src/python/nimbusml/feature_extraction/image/loader.py
+++ b/src/python/nimbusml/feature_extraction/image/_loader.py
@@ -13,7 +13,7 @@
 from sklearn.base import TransformerMixin
 
 from ...base_transform import BaseTransform
-from ...internal.core.feature_extraction.image.loader import Loader as core
+from ...internal.core.feature_extraction.image._loader import Loader as core
 from ...internal.utils.utils import trace
 
 
diff --git a/src/python/nimbusml/feature_extraction/image/pixelextractor.py b/src/python/nimbusml/feature_extraction/image/_pixelextractor.py
similarity index 98%
rename from src/python/nimbusml/feature_extraction/image/pixelextractor.py
rename to src/python/nimbusml/feature_extraction/image/_pixelextractor.py
index 89219e4c..14f4f305 100644
--- a/src/python/nimbusml/feature_extraction/image/pixelextractor.py
+++ b/src/python/nimbusml/feature_extraction/image/_pixelextractor.py
@@ -13,7 +13,7 @@
 from sklearn.base import TransformerMixin
 
 from ...base_transform import BaseTransform
-from ...internal.core.feature_extraction.image.pixelextractor import \
+from ...internal.core.feature_extraction.image._pixelextractor import \
     PixelExtractor as core
 from ...internal.utils.utils import trace
 
diff --git a/src/python/nimbusml/feature_extraction/image/resizer.py b/src/python/nimbusml/feature_extraction/image/_resizer.py
similarity index 97%
rename from src/python/nimbusml/feature_extraction/image/resizer.py
rename to src/python/nimbusml/feature_extraction/image/_resizer.py
index 77d9434f..bd8a9008 100644
--- a/src/python/nimbusml/feature_extraction/image/resizer.py
+++ b/src/python/nimbusml/feature_extraction/image/_resizer.py
@@ -13,7 +13,7 @@
 from sklearn.base import TransformerMixin
 
 from ...base_transform import BaseTransform
-from ...internal.core.feature_extraction.image.resizer import Resizer as core
+from ...internal.core.feature_extraction.image._resizer import Resizer as core
 from ...internal.utils.utils import trace
 
 
diff --git a/src/python/nimbusml/feature_extraction/text/__init__.py b/src/python/nimbusml/feature_extraction/text/__init__.py
index 7dbd24cf..450a82b1 100644
--- a/src/python/nimbusml/feature_extraction/text/__init__.py
+++ b/src/python/nimbusml/feature_extraction/text/__init__.py
@@ -1,7 +1,7 @@
-from .lightlda import LightLda
-from .ngramfeaturizer import NGramFeaturizer
-from .sentiment import Sentiment
-from .wordembedding import WordEmbedding
+from ._lightlda import LightLda
+from ._ngramfeaturizer import NGramFeaturizer
+from ._sentiment import Sentiment
+from ._wordembedding import WordEmbedding
 
 __all__ = [
     'LightLda',
@@ -9,3 +9,4 @@
     'Sentiment',
     'WordEmbedding'
 ]
+
diff --git a/src/python/nimbusml/feature_extraction/text/lightlda.py b/src/python/nimbusml/feature_extraction/text/_lightlda.py
similarity index 98%
rename from src/python/nimbusml/feature_extraction/text/lightlda.py
rename to src/python/nimbusml/feature_extraction/text/_lightlda.py
index 9e8ac415..27de602b 100644
--- a/src/python/nimbusml/feature_extraction/text/lightlda.py
+++ b/src/python/nimbusml/feature_extraction/text/_lightlda.py
@@ -13,7 +13,7 @@
 from sklearn.base import TransformerMixin
 
 from ...base_transform import BaseTransform
-from ...internal.core.feature_extraction.text.lightlda import LightLda as core
+from ...internal.core.feature_extraction.text._lightlda import LightLda as core
 from ...internal.utils.utils import trace
 
 
diff --git a/src/python/nimbusml/feature_extraction/text/ngramfeaturizer.py b/src/python/nimbusml/feature_extraction/text/_ngramfeaturizer.py
similarity index 99%
rename from src/python/nimbusml/feature_extraction/text/ngramfeaturizer.py
rename to src/python/nimbusml/feature_extraction/text/_ngramfeaturizer.py
index 4f726eee..b275aff5 100644
--- a/src/python/nimbusml/feature_extraction/text/ngramfeaturizer.py
+++ b/src/python/nimbusml/feature_extraction/text/_ngramfeaturizer.py
@@ -13,7 +13,7 @@
 from sklearn.base import TransformerMixin
 
 from ...base_transform import BaseTransform
-from ...internal.core.feature_extraction.text.ngramfeaturizer import \
+from ...internal.core.feature_extraction.text._ngramfeaturizer import \
     NGramFeaturizer as core
 from ...internal.utils.utils import trace
 from .extractor import Ngram
diff --git a/src/python/nimbusml/feature_extraction/text/sentiment.py b/src/python/nimbusml/feature_extraction/text/_sentiment.py
similarity index 97%
rename from src/python/nimbusml/feature_extraction/text/sentiment.py
rename to src/python/nimbusml/feature_extraction/text/_sentiment.py
index a3363216..572dac3c 100644
--- a/src/python/nimbusml/feature_extraction/text/sentiment.py
+++ b/src/python/nimbusml/feature_extraction/text/_sentiment.py
@@ -13,7 +13,7 @@
 from sklearn.base import TransformerMixin
 
 from ...base_transform import BaseTransform
-from ...internal.core.feature_extraction.text.sentiment import \
+from ...internal.core.feature_extraction.text._sentiment import \
     Sentiment as core
 from ...internal.utils.utils import trace
 
diff --git a/src/python/nimbusml/feature_extraction/text/wordembedding.py b/src/python/nimbusml/feature_extraction/text/_wordembedding.py
similarity index 98%
rename from src/python/nimbusml/feature_extraction/text/wordembedding.py
rename to src/python/nimbusml/feature_extraction/text/_wordembedding.py
index 452c735e..c604df04 100644
--- a/src/python/nimbusml/feature_extraction/text/wordembedding.py
+++ b/src/python/nimbusml/feature_extraction/text/_wordembedding.py
@@ -13,7 +13,7 @@
 from sklearn.base import TransformerMixin
 
 from ...base_transform import BaseTransform
-from ...internal.core.feature_extraction.text.wordembedding import \
+from ...internal.core.feature_extraction.text._wordembedding import \
     WordEmbedding as core
 from ...internal.utils.utils import trace
 
diff --git a/src/python/nimbusml/feature_extraction/text/extractor/__init__.py b/src/python/nimbusml/feature_extraction/text/extractor/__init__.py
index dcef2742..53015647 100644
--- a/src/python/nimbusml/feature_extraction/text/extractor/__init__.py
+++ b/src/python/nimbusml/feature_extraction/text/extractor/__init__.py
@@ -1,7 +1,8 @@
-from .ngram import Ngram
-from .ngramhash import NgramHash
+from ._ngram import Ngram
+from ._ngramhash import NgramHash
 
 __all__ = [
     'Ngram',
     'NgramHash'
 ]
+
diff --git a/src/python/nimbusml/feature_extraction/text/extractor/ngram.py b/src/python/nimbusml/feature_extraction/text/extractor/_ngram.py
similarity index 97%
rename from src/python/nimbusml/feature_extraction/text/extractor/ngram.py
rename to src/python/nimbusml/feature_extraction/text/extractor/_ngram.py
index 8b40e117..cb4fc113 100644
--- a/src/python/nimbusml/feature_extraction/text/extractor/ngram.py
+++ b/src/python/nimbusml/feature_extraction/text/extractor/_ngram.py
@@ -10,7 +10,7 @@
 __all__ = ["Ngram"]
 
 
-from ....internal.core.feature_extraction.text.extractor.ngram import \
+from ....internal.core.feature_extraction.text.extractor._ngram import \
     Ngram as core
 from ....internal.utils.utils import trace
 
diff --git a/src/python/nimbusml/feature_extraction/text/extractor/ngramhash.py b/src/python/nimbusml/feature_extraction/text/extractor/_ngramhash.py
similarity index 98%
rename from src/python/nimbusml/feature_extraction/text/extractor/ngramhash.py
rename to src/python/nimbusml/feature_extraction/text/extractor/_ngramhash.py
index 5a79b890..8d7c9c92 100644
--- a/src/python/nimbusml/feature_extraction/text/extractor/ngramhash.py
+++ b/src/python/nimbusml/feature_extraction/text/extractor/_ngramhash.py
@@ -10,7 +10,7 @@
 __all__ = ["NgramHash"]
 
 
-from ....internal.core.feature_extraction.text.extractor.ngramhash import \
+from ....internal.core.feature_extraction.text.extractor._ngramhash import \
     NgramHash as core
 from ....internal.utils.utils import trace
 
diff --git a/src/python/nimbusml/feature_extraction/text/stopwords/__init__.py b/src/python/nimbusml/feature_extraction/text/stopwords/__init__.py
index d58465be..9f3dbb9b 100644
--- a/src/python/nimbusml/feature_extraction/text/stopwords/__init__.py
+++ b/src/python/nimbusml/feature_extraction/text/stopwords/__init__.py
@@ -1,7 +1,8 @@
-from .customstopwordsremover import CustomStopWordsRemover
-from .predefinedstopwordsremover import PredefinedStopWordsRemover
+from ._customstopwordsremover import CustomStopWordsRemover
+from ._predefinedstopwordsremover import PredefinedStopWordsRemover
 
 __all__ = [
     'CustomStopWordsRemover',
     'PredefinedStopWordsRemover'
 ]
+
diff --git a/src/python/nimbusml/feature_extraction/text/stopwords/customstopwordsremover.py b/src/python/nimbusml/feature_extraction/text/stopwords/_customstopwordsremover.py
similarity index 93%
rename from src/python/nimbusml/feature_extraction/text/stopwords/customstopwordsremover.py
rename to src/python/nimbusml/feature_extraction/text/stopwords/_customstopwordsremover.py
index b911ee10..d9ac5233 100644
--- a/src/python/nimbusml/feature_extraction/text/stopwords/customstopwordsremover.py
+++ b/src/python/nimbusml/feature_extraction/text/stopwords/_customstopwordsremover.py
@@ -9,9 +9,9 @@
 
 __all__ = ["CustomStopWordsRemover"]
 
-from \
-    ....internal.core.feature_extraction.text.stopwords.customstopwordsremover \
-    import CustomStopWordsRemover as core
+
+from ....internal.core.feature_extraction.text.stopwords._customstopwordsremover import \
+    CustomStopWordsRemover as core
 from ....internal.utils.utils import trace
 
 
diff --git a/src/python/nimbusml/feature_extraction/text/stopwords/predefinedstopwordsremover.py b/src/python/nimbusml/feature_extraction/text/stopwords/_predefinedstopwordsremover.py
similarity index 92%
rename from src/python/nimbusml/feature_extraction/text/stopwords/predefinedstopwordsremover.py
rename to src/python/nimbusml/feature_extraction/text/stopwords/_predefinedstopwordsremover.py
index 1a236cb1..b2a56371 100644
--- a/src/python/nimbusml/feature_extraction/text/stopwords/predefinedstopwordsremover.py
+++ b/src/python/nimbusml/feature_extraction/text/stopwords/_predefinedstopwordsremover.py
@@ -9,9 +9,9 @@
 
 __all__ = ["PredefinedStopWordsRemover"]
 
-from \
-    ....internal.core.feature_extraction.text.stopwords.predefinedstopwordsremover \
-    import PredefinedStopWordsRemover as core
+
+from ....internal.core.feature_extraction.text.stopwords._predefinedstopwordsremover import \
+    PredefinedStopWordsRemover as core
 from ....internal.utils.utils import trace
 
 
diff --git a/src/python/nimbusml/feature_selection/__init__.py b/src/python/nimbusml/feature_selection/__init__.py
index 8b325f18..755dd694 100644
--- a/src/python/nimbusml/feature_selection/__init__.py
+++ b/src/python/nimbusml/feature_selection/__init__.py
@@ -1,7 +1,9 @@
-from .countselector import CountSelector
-from .mutualinformationselector import MutualInformationSelector
+from ._countselector import CountSelector
+from ._mutualinformationselector import MutualInformationSelector
 
 __all__ = [
     'CountSelector',
     'MutualInformationSelector'
 ]
+
+
diff --git a/src/python/nimbusml/feature_selection/countselector.py b/src/python/nimbusml/feature_selection/_countselector.py
similarity index 97%
rename from src/python/nimbusml/feature_selection/countselector.py
rename to src/python/nimbusml/feature_selection/_countselector.py
index 7aabbf33..ddf15ef5 100644
--- a/src/python/nimbusml/feature_selection/countselector.py
+++ b/src/python/nimbusml/feature_selection/_countselector.py
@@ -13,7 +13,7 @@
 from sklearn.base import TransformerMixin
 
 from ..base_transform import BaseTransform
-from ..internal.core.feature_selection.countselector import \
+from ..internal.core.feature_selection._countselector import \
     CountSelector as core
 from ..internal.utils.utils import trace
 
diff --git a/src/python/nimbusml/feature_selection/mutualinformationselector.py b/src/python/nimbusml/feature_selection/_mutualinformationselector.py
similarity index 98%
rename from src/python/nimbusml/feature_selection/mutualinformationselector.py
rename to src/python/nimbusml/feature_selection/_mutualinformationselector.py
index a8837293..c9f6e6fa 100644
--- a/src/python/nimbusml/feature_selection/mutualinformationselector.py
+++ b/src/python/nimbusml/feature_selection/_mutualinformationselector.py
@@ -13,7 +13,7 @@
 from sklearn.base import TransformerMixin
 
 from ..base_transform import BaseTransform
-from ..internal.core.feature_selection.mutualinformationselector import \
+from ..internal.core.feature_selection._mutualinformationselector import \
     MutualInformationSelector as core
 from ..internal.utils.utils import trace
 
diff --git a/src/python/nimbusml/internal/core/cluster/kmeansplusplus.py b/src/python/nimbusml/internal/core/cluster/_kmeansplusplus.py
similarity index 100%
rename from src/python/nimbusml/internal/core/cluster/kmeansplusplus.py
rename to src/python/nimbusml/internal/core/cluster/_kmeansplusplus.py
diff --git a/src/python/nimbusml/internal/core/decomposition/factorizationmachinebinaryclassifier.py b/src/python/nimbusml/internal/core/decomposition/_factorizationmachinebinaryclassifier.py
similarity index 100%
rename from src/python/nimbusml/internal/core/decomposition/factorizationmachinebinaryclassifier.py
rename to src/python/nimbusml/internal/core/decomposition/_factorizationmachinebinaryclassifier.py
diff --git a/src/python/nimbusml/internal/core/decomposition/pcaanomalydetector.py b/src/python/nimbusml/internal/core/decomposition/_pcaanomalydetector.py
similarity index 100%
rename from src/python/nimbusml/internal/core/decomposition/pcaanomalydetector.py
rename to src/python/nimbusml/internal/core/decomposition/_pcaanomalydetector.py
diff --git a/src/python/nimbusml/internal/core/decomposition/pcatransformer.py b/src/python/nimbusml/internal/core/decomposition/_pcatransformer.py
similarity index 100%
rename from src/python/nimbusml/internal/core/decomposition/pcatransformer.py
rename to src/python/nimbusml/internal/core/decomposition/_pcatransformer.py
diff --git a/src/python/nimbusml/internal/core/ensemble/fastforestbinaryclassifier.py b/src/python/nimbusml/internal/core/ensemble/_fastforestbinaryclassifier.py
similarity index 100%
rename from src/python/nimbusml/internal/core/ensemble/fastforestbinaryclassifier.py
rename to src/python/nimbusml/internal/core/ensemble/_fastforestbinaryclassifier.py
diff --git a/src/python/nimbusml/internal/core/ensemble/fastforestregressor.py b/src/python/nimbusml/internal/core/ensemble/_fastforestregressor.py
similarity index 100%
rename from src/python/nimbusml/internal/core/ensemble/fastforestregressor.py
rename to src/python/nimbusml/internal/core/ensemble/_fastforestregressor.py
diff --git a/src/python/nimbusml/internal/core/ensemble/fasttreesbinaryclassifier.py b/src/python/nimbusml/internal/core/ensemble/_fasttreesbinaryclassifier.py
similarity index 100%
rename from src/python/nimbusml/internal/core/ensemble/fasttreesbinaryclassifier.py
rename to src/python/nimbusml/internal/core/ensemble/_fasttreesbinaryclassifier.py
diff --git a/src/python/nimbusml/internal/core/ensemble/fasttreesregressor.py b/src/python/nimbusml/internal/core/ensemble/_fasttreesregressor.py
similarity index 100%
rename from src/python/nimbusml/internal/core/ensemble/fasttreesregressor.py
rename to src/python/nimbusml/internal/core/ensemble/_fasttreesregressor.py
diff --git a/src/python/nimbusml/internal/core/ensemble/fasttreestweedieregressor.py b/src/python/nimbusml/internal/core/ensemble/_fasttreestweedieregressor.py
similarity index 100%
rename from src/python/nimbusml/internal/core/ensemble/fasttreestweedieregressor.py
rename to src/python/nimbusml/internal/core/ensemble/_fasttreestweedieregressor.py
diff --git a/src/python/nimbusml/internal/core/ensemble/gambinaryclassifier.py b/src/python/nimbusml/internal/core/ensemble/_gambinaryclassifier.py
similarity index 100%
rename from src/python/nimbusml/internal/core/ensemble/gambinaryclassifier.py
rename to src/python/nimbusml/internal/core/ensemble/_gambinaryclassifier.py
diff --git a/src/python/nimbusml/internal/core/ensemble/gamregressor.py b/src/python/nimbusml/internal/core/ensemble/_gamregressor.py
similarity index 100%
rename from src/python/nimbusml/internal/core/ensemble/gamregressor.py
rename to src/python/nimbusml/internal/core/ensemble/_gamregressor.py
diff --git a/src/python/nimbusml/internal/core/ensemble/lightgbmbinaryclassifier.py b/src/python/nimbusml/internal/core/ensemble/_lightgbmbinaryclassifier.py
similarity index 100%
rename from src/python/nimbusml/internal/core/ensemble/lightgbmbinaryclassifier.py
rename to src/python/nimbusml/internal/core/ensemble/_lightgbmbinaryclassifier.py
diff --git a/src/python/nimbusml/internal/core/ensemble/lightgbmclassifier.py b/src/python/nimbusml/internal/core/ensemble/_lightgbmclassifier.py
similarity index 100%
rename from src/python/nimbusml/internal/core/ensemble/lightgbmclassifier.py
rename to src/python/nimbusml/internal/core/ensemble/_lightgbmclassifier.py
diff --git a/src/python/nimbusml/internal/core/ensemble/lightgbmranker.py b/src/python/nimbusml/internal/core/ensemble/_lightgbmranker.py
similarity index 100%
rename from src/python/nimbusml/internal/core/ensemble/lightgbmranker.py
rename to src/python/nimbusml/internal/core/ensemble/_lightgbmranker.py
diff --git a/src/python/nimbusml/internal/core/ensemble/lightgbmregressor.py b/src/python/nimbusml/internal/core/ensemble/_lightgbmregressor.py
similarity index 100%
rename from src/python/nimbusml/internal/core/ensemble/lightgbmregressor.py
rename to src/python/nimbusml/internal/core/ensemble/_lightgbmregressor.py
diff --git a/src/python/nimbusml/internal/core/ensemble/booster/dart.py b/src/python/nimbusml/internal/core/ensemble/booster/_dart.py
similarity index 100%
rename from src/python/nimbusml/internal/core/ensemble/booster/dart.py
rename to src/python/nimbusml/internal/core/ensemble/booster/_dart.py
diff --git a/src/python/nimbusml/internal/core/ensemble/booster/gbdt.py b/src/python/nimbusml/internal/core/ensemble/booster/_gbdt.py
similarity index 100%
rename from src/python/nimbusml/internal/core/ensemble/booster/gbdt.py
rename to src/python/nimbusml/internal/core/ensemble/booster/_gbdt.py
diff --git a/src/python/nimbusml/internal/core/ensemble/booster/goss.py b/src/python/nimbusml/internal/core/ensemble/booster/_goss.py
similarity index 100%
rename from src/python/nimbusml/internal/core/ensemble/booster/goss.py
rename to src/python/nimbusml/internal/core/ensemble/booster/_goss.py
diff --git a/src/python/nimbusml/internal/core/feature_extraction/treefeaturizer.py b/src/python/nimbusml/internal/core/feature_extraction/_treefeaturizer.py
similarity index 100%
rename from src/python/nimbusml/internal/core/feature_extraction/treefeaturizer.py
rename to src/python/nimbusml/internal/core/feature_extraction/_treefeaturizer.py
diff --git a/src/python/nimbusml/internal/core/feature_extraction/categorical/onehothashvectorizer.py b/src/python/nimbusml/internal/core/feature_extraction/categorical/_onehothashvectorizer.py
similarity index 100%
rename from src/python/nimbusml/internal/core/feature_extraction/categorical/onehothashvectorizer.py
rename to src/python/nimbusml/internal/core/feature_extraction/categorical/_onehothashvectorizer.py
diff --git a/src/python/nimbusml/internal/core/feature_extraction/categorical/onehotvectorizer.py b/src/python/nimbusml/internal/core/feature_extraction/categorical/_onehotvectorizer.py
similarity index 100%
rename from src/python/nimbusml/internal/core/feature_extraction/categorical/onehotvectorizer.py
rename to src/python/nimbusml/internal/core/feature_extraction/categorical/_onehotvectorizer.py
diff --git a/src/python/nimbusml/internal/core/feature_extraction/image/loader.py b/src/python/nimbusml/internal/core/feature_extraction/image/_loader.py
similarity index 100%
rename from src/python/nimbusml/internal/core/feature_extraction/image/loader.py
rename to src/python/nimbusml/internal/core/feature_extraction/image/_loader.py
diff --git a/src/python/nimbusml/internal/core/feature_extraction/image/pixelextractor.py b/src/python/nimbusml/internal/core/feature_extraction/image/_pixelextractor.py
similarity index 100%
rename from src/python/nimbusml/internal/core/feature_extraction/image/pixelextractor.py
rename to src/python/nimbusml/internal/core/feature_extraction/image/_pixelextractor.py
diff --git a/src/python/nimbusml/internal/core/feature_extraction/image/resizer.py b/src/python/nimbusml/internal/core/feature_extraction/image/_resizer.py
similarity index 100%
rename from src/python/nimbusml/internal/core/feature_extraction/image/resizer.py
rename to src/python/nimbusml/internal/core/feature_extraction/image/_resizer.py
diff --git a/src/python/nimbusml/internal/core/feature_extraction/text/lightlda.py b/src/python/nimbusml/internal/core/feature_extraction/text/_lightlda.py
similarity index 100%
rename from src/python/nimbusml/internal/core/feature_extraction/text/lightlda.py
rename to src/python/nimbusml/internal/core/feature_extraction/text/_lightlda.py
diff --git a/src/python/nimbusml/internal/core/feature_extraction/text/ngramfeaturizer.py b/src/python/nimbusml/internal/core/feature_extraction/text/_ngramfeaturizer.py
similarity index 100%
rename from src/python/nimbusml/internal/core/feature_extraction/text/ngramfeaturizer.py
rename to src/python/nimbusml/internal/core/feature_extraction/text/_ngramfeaturizer.py
diff --git a/src/python/nimbusml/internal/core/feature_extraction/text/sentiment.py b/src/python/nimbusml/internal/core/feature_extraction/text/_sentiment.py
similarity index 100%
rename from src/python/nimbusml/internal/core/feature_extraction/text/sentiment.py
rename to src/python/nimbusml/internal/core/feature_extraction/text/_sentiment.py
diff --git a/src/python/nimbusml/internal/core/feature_extraction/text/wordembedding.py b/src/python/nimbusml/internal/core/feature_extraction/text/_wordembedding.py
similarity index 100%
rename from src/python/nimbusml/internal/core/feature_extraction/text/wordembedding.py
rename to src/python/nimbusml/internal/core/feature_extraction/text/_wordembedding.py
diff --git a/src/python/nimbusml/internal/core/feature_extraction/text/extractor/ngram.py b/src/python/nimbusml/internal/core/feature_extraction/text/extractor/_ngram.py
similarity index 100%
rename from src/python/nimbusml/internal/core/feature_extraction/text/extractor/ngram.py
rename to src/python/nimbusml/internal/core/feature_extraction/text/extractor/_ngram.py
diff --git a/src/python/nimbusml/internal/core/feature_extraction/text/extractor/ngramhash.py b/src/python/nimbusml/internal/core/feature_extraction/text/extractor/_ngramhash.py
similarity index 100%
rename from src/python/nimbusml/internal/core/feature_extraction/text/extractor/ngramhash.py
rename to src/python/nimbusml/internal/core/feature_extraction/text/extractor/_ngramhash.py
diff --git a/src/python/nimbusml/internal/core/feature_extraction/text/stopwords/customstopwordsremover.py b/src/python/nimbusml/internal/core/feature_extraction/text/stopwords/_customstopwordsremover.py
similarity index 100%
rename from src/python/nimbusml/internal/core/feature_extraction/text/stopwords/customstopwordsremover.py
rename to src/python/nimbusml/internal/core/feature_extraction/text/stopwords/_customstopwordsremover.py
diff --git a/src/python/nimbusml/internal/core/feature_extraction/text/stopwords/predefinedstopwordsremover.py b/src/python/nimbusml/internal/core/feature_extraction/text/stopwords/_predefinedstopwordsremover.py
similarity index 100%
rename from src/python/nimbusml/internal/core/feature_extraction/text/stopwords/predefinedstopwordsremover.py
rename to src/python/nimbusml/internal/core/feature_extraction/text/stopwords/_predefinedstopwordsremover.py
diff --git a/src/python/nimbusml/internal/core/feature_selection/countselector.py b/src/python/nimbusml/internal/core/feature_selection/_countselector.py
similarity index 100%
rename from src/python/nimbusml/internal/core/feature_selection/countselector.py
rename to src/python/nimbusml/internal/core/feature_selection/_countselector.py
diff --git a/src/python/nimbusml/internal/core/feature_selection/mutualinformationselector.py b/src/python/nimbusml/internal/core/feature_selection/_mutualinformationselector.py
similarity index 100%
rename from src/python/nimbusml/internal/core/feature_selection/mutualinformationselector.py
rename to src/python/nimbusml/internal/core/feature_selection/_mutualinformationselector.py
diff --git a/src/python/nimbusml/internal/core/linear_model/averagedperceptronbinaryclassifier.py b/src/python/nimbusml/internal/core/linear_model/_averagedperceptronbinaryclassifier.py
similarity index 100%
rename from src/python/nimbusml/internal/core/linear_model/averagedperceptronbinaryclassifier.py
rename to src/python/nimbusml/internal/core/linear_model/_averagedperceptronbinaryclassifier.py
diff --git a/src/python/nimbusml/internal/core/linear_model/fastlinearbinaryclassifier.py b/src/python/nimbusml/internal/core/linear_model/_fastlinearbinaryclassifier.py
similarity index 100%
rename from src/python/nimbusml/internal/core/linear_model/fastlinearbinaryclassifier.py
rename to src/python/nimbusml/internal/core/linear_model/_fastlinearbinaryclassifier.py
diff --git a/src/python/nimbusml/internal/core/linear_model/fastlinearclassifier.py b/src/python/nimbusml/internal/core/linear_model/_fastlinearclassifier.py
similarity index 100%
rename from src/python/nimbusml/internal/core/linear_model/fastlinearclassifier.py
rename to src/python/nimbusml/internal/core/linear_model/_fastlinearclassifier.py
diff --git a/src/python/nimbusml/internal/core/linear_model/fastlinearregressor.py b/src/python/nimbusml/internal/core/linear_model/_fastlinearregressor.py
similarity index 100%
rename from src/python/nimbusml/internal/core/linear_model/fastlinearregressor.py
rename to src/python/nimbusml/internal/core/linear_model/_fastlinearregressor.py
diff --git a/src/python/nimbusml/internal/core/linear_model/logisticregressionbinaryclassifier.py b/src/python/nimbusml/internal/core/linear_model/_logisticregressionbinaryclassifier.py
similarity index 100%
rename from src/python/nimbusml/internal/core/linear_model/logisticregressionbinaryclassifier.py
rename to src/python/nimbusml/internal/core/linear_model/_logisticregressionbinaryclassifier.py
diff --git a/src/python/nimbusml/internal/core/linear_model/logisticregressionclassifier.py b/src/python/nimbusml/internal/core/linear_model/_logisticregressionclassifier.py
similarity index 100%
rename from src/python/nimbusml/internal/core/linear_model/logisticregressionclassifier.py
rename to src/python/nimbusml/internal/core/linear_model/_logisticregressionclassifier.py
diff --git a/src/python/nimbusml/internal/core/linear_model/onlinegradientdescentregressor.py b/src/python/nimbusml/internal/core/linear_model/_onlinegradientdescentregressor.py
similarity index 100%
rename from src/python/nimbusml/internal/core/linear_model/onlinegradientdescentregressor.py
rename to src/python/nimbusml/internal/core/linear_model/_onlinegradientdescentregressor.py
diff --git a/src/python/nimbusml/internal/core/linear_model/ordinaryleastsquaresregressor.py b/src/python/nimbusml/internal/core/linear_model/_ordinaryleastsquaresregressor.py
similarity index 100%
rename from src/python/nimbusml/internal/core/linear_model/ordinaryleastsquaresregressor.py
rename to src/python/nimbusml/internal/core/linear_model/_ordinaryleastsquaresregressor.py
diff --git a/src/python/nimbusml/internal/core/linear_model/poissonregressionregressor.py b/src/python/nimbusml/internal/core/linear_model/_poissonregressionregressor.py
similarity index 100%
rename from src/python/nimbusml/internal/core/linear_model/poissonregressionregressor.py
rename to src/python/nimbusml/internal/core/linear_model/_poissonregressionregressor.py
diff --git a/src/python/nimbusml/internal/core/linear_model/sgdbinaryclassifier.py b/src/python/nimbusml/internal/core/linear_model/_sgdbinaryclassifier.py
similarity index 100%
rename from src/python/nimbusml/internal/core/linear_model/sgdbinaryclassifier.py
rename to src/python/nimbusml/internal/core/linear_model/_sgdbinaryclassifier.py
diff --git a/src/python/nimbusml/internal/core/linear_model/symsgdbinaryclassifier.py b/src/python/nimbusml/internal/core/linear_model/_symsgdbinaryclassifier.py
similarity index 100%
rename from src/python/nimbusml/internal/core/linear_model/symsgdbinaryclassifier.py
rename to src/python/nimbusml/internal/core/linear_model/_symsgdbinaryclassifier.py
diff --git a/src/python/nimbusml/internal/core/loss/loss_factory.py b/src/python/nimbusml/internal/core/loss/loss_factory.py
index ab097b3a..c34b809d 100644
--- a/src/python/nimbusml/internal/core/loss/loss_factory.py
+++ b/src/python/nimbusml/internal/core/loss/loss_factory.py
@@ -100,7 +100,7 @@ def create_loss(cls, component_kind, learner, api_loss):
                 api_loss_name = getattr(api_loss, '_string_name')
                 api_loss_params = getattr(api_loss, '_params')
             except BaseException:
-                # The given object is not a nimbusml loss object
+                # The given object is not a pytlc loss object
                 raise TypeError(error_msg)
 
         if api_loss_name not in valid_str_losses:
diff --git a/src/python/nimbusml/internal/core/multiclass/onevsrestclassifier.py b/src/python/nimbusml/internal/core/multiclass/_onevsrestclassifier.py
similarity index 100%
rename from src/python/nimbusml/internal/core/multiclass/onevsrestclassifier.py
rename to src/python/nimbusml/internal/core/multiclass/_onevsrestclassifier.py
diff --git a/src/python/nimbusml/internal/core/naive_bayes/naivebayesclassifier.py b/src/python/nimbusml/internal/core/naive_bayes/_naivebayesclassifier.py
similarity index 100%
rename from src/python/nimbusml/internal/core/naive_bayes/naivebayesclassifier.py
rename to src/python/nimbusml/internal/core/naive_bayes/_naivebayesclassifier.py
diff --git a/src/python/nimbusml/internal/core/preprocessing/fromkey.py b/src/python/nimbusml/internal/core/preprocessing/_fromkey.py
similarity index 100%
rename from src/python/nimbusml/internal/core/preprocessing/fromkey.py
rename to src/python/nimbusml/internal/core/preprocessing/_fromkey.py
diff --git a/src/python/nimbusml/internal/core/preprocessing/tensorflowscorer.py b/src/python/nimbusml/internal/core/preprocessing/_tensorflowscorer.py
similarity index 100%
rename from src/python/nimbusml/internal/core/preprocessing/tensorflowscorer.py
rename to src/python/nimbusml/internal/core/preprocessing/_tensorflowscorer.py
diff --git a/src/python/nimbusml/internal/core/preprocessing/tokey.py b/src/python/nimbusml/internal/core/preprocessing/_tokey.py
similarity index 100%
rename from src/python/nimbusml/internal/core/preprocessing/tokey.py
rename to src/python/nimbusml/internal/core/preprocessing/_tokey.py
diff --git a/src/python/nimbusml/internal/core/preprocessing/filter/bootstrapsampler.py b/src/python/nimbusml/internal/core/preprocessing/filter/_bootstrapsampler.py
similarity index 100%
rename from src/python/nimbusml/internal/core/preprocessing/filter/bootstrapsampler.py
rename to src/python/nimbusml/internal/core/preprocessing/filter/_bootstrapsampler.py
diff --git a/src/python/nimbusml/internal/core/preprocessing/filter/rangefilter.py b/src/python/nimbusml/internal/core/preprocessing/filter/_rangefilter.py
similarity index 100%
rename from src/python/nimbusml/internal/core/preprocessing/filter/rangefilter.py
rename to src/python/nimbusml/internal/core/preprocessing/filter/_rangefilter.py
diff --git a/src/python/nimbusml/internal/core/preprocessing/filter/skipfilter.py b/src/python/nimbusml/internal/core/preprocessing/filter/_skipfilter.py
similarity index 100%
rename from src/python/nimbusml/internal/core/preprocessing/filter/skipfilter.py
rename to src/python/nimbusml/internal/core/preprocessing/filter/_skipfilter.py
diff --git a/src/python/nimbusml/internal/core/preprocessing/filter/takefilter.py b/src/python/nimbusml/internal/core/preprocessing/filter/_takefilter.py
similarity index 100%
rename from src/python/nimbusml/internal/core/preprocessing/filter/takefilter.py
rename to src/python/nimbusml/internal/core/preprocessing/filter/_takefilter.py
diff --git a/src/python/nimbusml/internal/core/preprocessing/missing_values/filter.py b/src/python/nimbusml/internal/core/preprocessing/missing_values/_filter.py
similarity index 100%
rename from src/python/nimbusml/internal/core/preprocessing/missing_values/filter.py
rename to src/python/nimbusml/internal/core/preprocessing/missing_values/_filter.py
diff --git a/src/python/nimbusml/internal/core/preprocessing/missing_values/handler.py b/src/python/nimbusml/internal/core/preprocessing/missing_values/_handler.py
similarity index 100%
rename from src/python/nimbusml/internal/core/preprocessing/missing_values/handler.py
rename to src/python/nimbusml/internal/core/preprocessing/missing_values/_handler.py
diff --git a/src/python/nimbusml/internal/core/preprocessing/missing_values/indicator.py b/src/python/nimbusml/internal/core/preprocessing/missing_values/_indicator.py
similarity index 100%
rename from src/python/nimbusml/internal/core/preprocessing/missing_values/indicator.py
rename to src/python/nimbusml/internal/core/preprocessing/missing_values/_indicator.py
diff --git a/src/python/nimbusml/internal/core/preprocessing/normalization/binner.py b/src/python/nimbusml/internal/core/preprocessing/normalization/_binner.py
similarity index 100%
rename from src/python/nimbusml/internal/core/preprocessing/normalization/binner.py
rename to src/python/nimbusml/internal/core/preprocessing/normalization/_binner.py
diff --git a/src/python/nimbusml/internal/core/preprocessing/normalization/globalcontrastrowscaler.py b/src/python/nimbusml/internal/core/preprocessing/normalization/_globalcontrastrowscaler.py
similarity index 100%
rename from src/python/nimbusml/internal/core/preprocessing/normalization/globalcontrastrowscaler.py
rename to src/python/nimbusml/internal/core/preprocessing/normalization/_globalcontrastrowscaler.py
diff --git a/src/python/nimbusml/internal/core/preprocessing/normalization/logmeanvariancescaler.py b/src/python/nimbusml/internal/core/preprocessing/normalization/_logmeanvariancescaler.py
similarity index 100%
rename from src/python/nimbusml/internal/core/preprocessing/normalization/logmeanvariancescaler.py
rename to src/python/nimbusml/internal/core/preprocessing/normalization/_logmeanvariancescaler.py
diff --git a/src/python/nimbusml/internal/core/preprocessing/normalization/meanvariancescaler.py b/src/python/nimbusml/internal/core/preprocessing/normalization/_meanvariancescaler.py
similarity index 100%
rename from src/python/nimbusml/internal/core/preprocessing/normalization/meanvariancescaler.py
rename to src/python/nimbusml/internal/core/preprocessing/normalization/_meanvariancescaler.py
diff --git a/src/python/nimbusml/internal/core/preprocessing/normalization/minmaxscaler.py b/src/python/nimbusml/internal/core/preprocessing/normalization/_minmaxscaler.py
similarity index 100%
rename from src/python/nimbusml/internal/core/preprocessing/normalization/minmaxscaler.py
rename to src/python/nimbusml/internal/core/preprocessing/normalization/_minmaxscaler.py
diff --git a/src/python/nimbusml/internal/core/preprocessing/schema/columnconcatenator.py b/src/python/nimbusml/internal/core/preprocessing/schema/_columnconcatenator.py
similarity index 100%
rename from src/python/nimbusml/internal/core/preprocessing/schema/columnconcatenator.py
rename to src/python/nimbusml/internal/core/preprocessing/schema/_columnconcatenator.py
diff --git a/src/python/nimbusml/internal/core/preprocessing/schema/columndropper.py b/src/python/nimbusml/internal/core/preprocessing/schema/_columndropper.py
similarity index 100%
rename from src/python/nimbusml/internal/core/preprocessing/schema/columndropper.py
rename to src/python/nimbusml/internal/core/preprocessing/schema/_columndropper.py
diff --git a/src/python/nimbusml/internal/core/preprocessing/schema/columnduplicator.py b/src/python/nimbusml/internal/core/preprocessing/schema/_columnduplicator.py
similarity index 100%
rename from src/python/nimbusml/internal/core/preprocessing/schema/columnduplicator.py
rename to src/python/nimbusml/internal/core/preprocessing/schema/_columnduplicator.py
diff --git a/src/python/nimbusml/internal/core/preprocessing/schema/columnselector.py b/src/python/nimbusml/internal/core/preprocessing/schema/_columnselector.py
similarity index 100%
rename from src/python/nimbusml/internal/core/preprocessing/schema/columnselector.py
rename to src/python/nimbusml/internal/core/preprocessing/schema/_columnselector.py
diff --git a/src/python/nimbusml/internal/core/preprocessing/schema/typeconverter.py b/src/python/nimbusml/internal/core/preprocessing/schema/_typeconverter.py
similarity index 100%
rename from src/python/nimbusml/internal/core/preprocessing/schema/typeconverter.py
rename to src/python/nimbusml/internal/core/preprocessing/schema/_typeconverter.py
diff --git a/src/python/nimbusml/internal/core/preprocessing/text/chartokenizer.py b/src/python/nimbusml/internal/core/preprocessing/text/_chartokenizer.py
similarity index 100%
rename from src/python/nimbusml/internal/core/preprocessing/text/chartokenizer.py
rename to src/python/nimbusml/internal/core/preprocessing/text/_chartokenizer.py
diff --git a/src/python/nimbusml/internal/utils/data_stream.py b/src/python/nimbusml/internal/utils/data_stream.py
index 8c4ef67f..9c648e63 100644
--- a/src/python/nimbusml/internal/utils/data_stream.py
+++ b/src/python/nimbusml/internal/utils/data_stream.py
@@ -3,7 +3,7 @@
 # Licensed under the MIT License.
 # --------------------------------------------------------------------------------------------
 """
-Owns nimbusml's containers.
+Owns pytlc's containers.
 """
 from shutil import copyfile
 
diff --git a/src/python/nimbusml/internal/utils/dataframes.py b/src/python/nimbusml/internal/utils/dataframes.py
index fe46ac20..cca54698 100644
--- a/src/python/nimbusml/internal/utils/dataframes.py
+++ b/src/python/nimbusml/internal/utils/dataframes.py
@@ -189,9 +189,9 @@ def get_obj(el):
                         "of the input columns has name 'F?'.\n" +
                         "This happens for example when X and y contain the "
                         "same column name.\n" +
-                        "nimbusml cannot distinguish between the label in X and "
+                        "pytlc cannot distinguish between the label in X and "
                         "the label in Y.\n" +
-                        "nimbusml generates intermediate columns with this kind "
+                        "pytlc generates intermediate columns with this kind "
                         "of name. Issue with column '{0}' among "
                         "columns\n{1}".format(
                             i,
diff --git a/src/python/nimbusml/linear_model/__init__.py b/src/python/nimbusml/linear_model/__init__.py
index 146c79e0..21ffb89c 100644
--- a/src/python/nimbusml/linear_model/__init__.py
+++ b/src/python/nimbusml/linear_model/__init__.py
@@ -1,16 +1,14 @@
-from .averagedperceptronbinaryclassifier import \
-    AveragedPerceptronBinaryClassifier
-from .fastlinearbinaryclassifier import FastLinearBinaryClassifier
-from .fastlinearclassifier import FastLinearClassifier
-from .fastlinearregressor import FastLinearRegressor
-from .logisticregressionbinaryclassifier import \
-    LogisticRegressionBinaryClassifier
-from .logisticregressionclassifier import LogisticRegressionClassifier
-from .onlinegradientdescentregressor import OnlineGradientDescentRegressor
-from .ordinaryleastsquaresregressor import OrdinaryLeastSquaresRegressor
-from .poissonregressionregressor import PoissonRegressionRegressor
-from .sgdbinaryclassifier import SgdBinaryClassifier
-from .symsgdbinaryclassifier import SymSgdBinaryClassifier
+from ._averagedperceptronbinaryclassifier import AveragedPerceptronBinaryClassifier
+from ._fastlinearbinaryclassifier import FastLinearBinaryClassifier
+from ._fastlinearclassifier import FastLinearClassifier
+from ._fastlinearregressor import FastLinearRegressor
+from ._logisticregressionbinaryclassifier import LogisticRegressionBinaryClassifier
+from ._logisticregressionclassifier import LogisticRegressionClassifier
+from ._onlinegradientdescentregressor import OnlineGradientDescentRegressor
+from ._ordinaryleastsquaresregressor import OrdinaryLeastSquaresRegressor
+from ._poissonregressionregressor import PoissonRegressionRegressor
+from ._sgdbinaryclassifier import SgdBinaryClassifier
+from ._symsgdbinaryclassifier import SymSgdBinaryClassifier
 
 __all__ = [
     'AveragedPerceptronBinaryClassifier',
@@ -23,5 +21,6 @@
     'OrdinaryLeastSquaresRegressor',
     'PoissonRegressionRegressor',
     'SgdBinaryClassifier',
-    'SymSgdBinaryClassifier'
+    'SymSgdBinaryClassifier',
 ]
+
diff --git a/src/python/nimbusml/linear_model/averagedperceptronbinaryclassifier.py b/src/python/nimbusml/linear_model/_averagedperceptronbinaryclassifier.py
similarity index 99%
rename from src/python/nimbusml/linear_model/averagedperceptronbinaryclassifier.py
rename to src/python/nimbusml/linear_model/_averagedperceptronbinaryclassifier.py
index aeae5e8f..1a2059e4 100644
--- a/src/python/nimbusml/linear_model/averagedperceptronbinaryclassifier.py
+++ b/src/python/nimbusml/linear_model/_averagedperceptronbinaryclassifier.py
@@ -13,7 +13,7 @@
 from sklearn.base import ClassifierMixin
 
 from ..base_predictor import BasePredictor
-from ..internal.core.linear_model.averagedperceptronbinaryclassifier import \
+from ..internal.core.linear_model._averagedperceptronbinaryclassifier import \
     AveragedPerceptronBinaryClassifier as core
 from ..internal.utils.utils import trace
 
diff --git a/src/python/nimbusml/linear_model/fastlinearbinaryclassifier.py b/src/python/nimbusml/linear_model/_fastlinearbinaryclassifier.py
similarity index 99%
rename from src/python/nimbusml/linear_model/fastlinearbinaryclassifier.py
rename to src/python/nimbusml/linear_model/_fastlinearbinaryclassifier.py
index 9374edd6..672c1c3c 100644
--- a/src/python/nimbusml/linear_model/fastlinearbinaryclassifier.py
+++ b/src/python/nimbusml/linear_model/_fastlinearbinaryclassifier.py
@@ -13,7 +13,7 @@
 from sklearn.base import ClassifierMixin
 
 from ..base_predictor import BasePredictor
-from ..internal.core.linear_model.fastlinearbinaryclassifier import \
+from ..internal.core.linear_model._fastlinearbinaryclassifier import \
     FastLinearBinaryClassifier as core
 from ..internal.utils.utils import trace
 
diff --git a/src/python/nimbusml/linear_model/fastlinearclassifier.py b/src/python/nimbusml/linear_model/_fastlinearclassifier.py
similarity index 99%
rename from src/python/nimbusml/linear_model/fastlinearclassifier.py
rename to src/python/nimbusml/linear_model/_fastlinearclassifier.py
index c9546c25..16b2ad57 100644
--- a/src/python/nimbusml/linear_model/fastlinearclassifier.py
+++ b/src/python/nimbusml/linear_model/_fastlinearclassifier.py
@@ -13,7 +13,7 @@
 from sklearn.base import ClassifierMixin
 
 from ..base_predictor import BasePredictor
-from ..internal.core.linear_model.fastlinearclassifier import \
+from ..internal.core.linear_model._fastlinearclassifier import \
     FastLinearClassifier as core
 from ..internal.utils.utils import trace
 
diff --git a/src/python/nimbusml/linear_model/fastlinearregressor.py b/src/python/nimbusml/linear_model/_fastlinearregressor.py
similarity index 99%
rename from src/python/nimbusml/linear_model/fastlinearregressor.py
rename to src/python/nimbusml/linear_model/_fastlinearregressor.py
index 7e180d1c..bc8eab2a 100644
--- a/src/python/nimbusml/linear_model/fastlinearregressor.py
+++ b/src/python/nimbusml/linear_model/_fastlinearregressor.py
@@ -13,7 +13,7 @@
 from sklearn.base import RegressorMixin
 
 from ..base_predictor import BasePredictor
-from ..internal.core.linear_model.fastlinearregressor import \
+from ..internal.core.linear_model._fastlinearregressor import \
     FastLinearRegressor as core
 from ..internal.utils.utils import trace
 
diff --git a/src/python/nimbusml/linear_model/logisticregressionbinaryclassifier.py b/src/python/nimbusml/linear_model/_logisticregressionbinaryclassifier.py
similarity index 99%
rename from src/python/nimbusml/linear_model/logisticregressionbinaryclassifier.py
rename to src/python/nimbusml/linear_model/_logisticregressionbinaryclassifier.py
index 7e434f4c..b752d999 100644
--- a/src/python/nimbusml/linear_model/logisticregressionbinaryclassifier.py
+++ b/src/python/nimbusml/linear_model/_logisticregressionbinaryclassifier.py
@@ -13,7 +13,7 @@
 from sklearn.base import ClassifierMixin
 
 from ..base_predictor import BasePredictor
-from ..internal.core.linear_model.logisticregressionbinaryclassifier import \
+from ..internal.core.linear_model._logisticregressionbinaryclassifier import \
     LogisticRegressionBinaryClassifier as core
 from ..internal.utils.utils import trace
 
diff --git a/src/python/nimbusml/linear_model/logisticregressionclassifier.py b/src/python/nimbusml/linear_model/_logisticregressionclassifier.py
similarity index 99%
rename from src/python/nimbusml/linear_model/logisticregressionclassifier.py
rename to src/python/nimbusml/linear_model/_logisticregressionclassifier.py
index 19c462e7..285ad543 100644
--- a/src/python/nimbusml/linear_model/logisticregressionclassifier.py
+++ b/src/python/nimbusml/linear_model/_logisticregressionclassifier.py
@@ -13,7 +13,7 @@
 from sklearn.base import ClassifierMixin
 
 from ..base_predictor import BasePredictor
-from ..internal.core.linear_model.logisticregressionclassifier import \
+from ..internal.core.linear_model._logisticregressionclassifier import \
     LogisticRegressionClassifier as core
 from ..internal.utils.utils import trace
 
diff --git a/src/python/nimbusml/linear_model/onlinegradientdescentregressor.py b/src/python/nimbusml/linear_model/_onlinegradientdescentregressor.py
similarity index 98%
rename from src/python/nimbusml/linear_model/onlinegradientdescentregressor.py
rename to src/python/nimbusml/linear_model/_onlinegradientdescentregressor.py
index 71796158..b5ef38de 100644
--- a/src/python/nimbusml/linear_model/onlinegradientdescentregressor.py
+++ b/src/python/nimbusml/linear_model/_onlinegradientdescentregressor.py
@@ -13,7 +13,7 @@
 from sklearn.base import RegressorMixin
 
 from ..base_predictor import BasePredictor
-from ..internal.core.linear_model.onlinegradientdescentregressor import \
+from ..internal.core.linear_model._onlinegradientdescentregressor import \
     OnlineGradientDescentRegressor as core
 from ..internal.utils.utils import trace
 
diff --git a/src/python/nimbusml/linear_model/ordinaryleastsquaresregressor.py b/src/python/nimbusml/linear_model/_ordinaryleastsquaresregressor.py
similarity index 98%
rename from src/python/nimbusml/linear_model/ordinaryleastsquaresregressor.py
rename to src/python/nimbusml/linear_model/_ordinaryleastsquaresregressor.py
index 08d07ac6..d22352a0 100644
--- a/src/python/nimbusml/linear_model/ordinaryleastsquaresregressor.py
+++ b/src/python/nimbusml/linear_model/_ordinaryleastsquaresregressor.py
@@ -13,7 +13,7 @@
 from sklearn.base import RegressorMixin
 
 from ..base_predictor import BasePredictor
-from ..internal.core.linear_model.ordinaryleastsquaresregressor import \
+from ..internal.core.linear_model._ordinaryleastsquaresregressor import \
     OrdinaryLeastSquaresRegressor as core
 from ..internal.utils.utils import trace
 
diff --git a/src/python/nimbusml/linear_model/poissonregressionregressor.py b/src/python/nimbusml/linear_model/_poissonregressionregressor.py
similarity index 99%
rename from src/python/nimbusml/linear_model/poissonregressionregressor.py
rename to src/python/nimbusml/linear_model/_poissonregressionregressor.py
index b260217d..faebd417 100644
--- a/src/python/nimbusml/linear_model/poissonregressionregressor.py
+++ b/src/python/nimbusml/linear_model/_poissonregressionregressor.py
@@ -13,7 +13,7 @@
 from sklearn.base import RegressorMixin
 
 from ..base_predictor import BasePredictor
-from ..internal.core.linear_model.poissonregressionregressor import \
+from ..internal.core.linear_model._poissonregressionregressor import \
     PoissonRegressionRegressor as core
 from ..internal.utils.utils import trace
 
diff --git a/src/python/nimbusml/linear_model/sgdbinaryclassifier.py b/src/python/nimbusml/linear_model/_sgdbinaryclassifier.py
similarity index 99%
rename from src/python/nimbusml/linear_model/sgdbinaryclassifier.py
rename to src/python/nimbusml/linear_model/_sgdbinaryclassifier.py
index 21a5d471..3a5b928f 100644
--- a/src/python/nimbusml/linear_model/sgdbinaryclassifier.py
+++ b/src/python/nimbusml/linear_model/_sgdbinaryclassifier.py
@@ -13,7 +13,7 @@
 from sklearn.base import ClassifierMixin
 
 from ..base_predictor import BasePredictor
-from ..internal.core.linear_model.sgdbinaryclassifier import \
+from ..internal.core.linear_model._sgdbinaryclassifier import \
     SgdBinaryClassifier as core
 from ..internal.utils.utils import trace
 
diff --git a/src/python/nimbusml/linear_model/symsgdbinaryclassifier.py b/src/python/nimbusml/linear_model/_symsgdbinaryclassifier.py
similarity index 98%
rename from src/python/nimbusml/linear_model/symsgdbinaryclassifier.py
rename to src/python/nimbusml/linear_model/_symsgdbinaryclassifier.py
index 5f5d1e87..4af5db42 100644
--- a/src/python/nimbusml/linear_model/symsgdbinaryclassifier.py
+++ b/src/python/nimbusml/linear_model/_symsgdbinaryclassifier.py
@@ -13,7 +13,7 @@
 from sklearn.base import ClassifierMixin
 
 from ..base_predictor import BasePredictor
-from ..internal.core.linear_model.symsgdbinaryclassifier import \
+from ..internal.core.linear_model._symsgdbinaryclassifier import \
     SymSgdBinaryClassifier as core
 from ..internal.utils.utils import trace
 
diff --git a/src/python/nimbusml/model_selection/__init__.py b/src/python/nimbusml/model_selection/__init__.py
index 08f12c6b..3cf19ad4 100644
--- a/src/python/nimbusml/model_selection/__init__.py
+++ b/src/python/nimbusml/model_selection/__init__.py
@@ -1,4 +1,4 @@
-from .cv import CV
+from ._cv import CV
 
 __all__ = [
     'CV'
diff --git a/src/python/nimbusml/model_selection/cv.py b/src/python/nimbusml/model_selection/_cv.py
similarity index 100%
rename from src/python/nimbusml/model_selection/cv.py
rename to src/python/nimbusml/model_selection/_cv.py
diff --git a/src/python/nimbusml/multiclass/__init__.py b/src/python/nimbusml/multiclass/__init__.py
index f5520192..71bad0cb 100644
--- a/src/python/nimbusml/multiclass/__init__.py
+++ b/src/python/nimbusml/multiclass/__init__.py
@@ -1,5 +1,6 @@
-from .onevsrestclassifier import OneVsRestClassifier
+from ._onevsrestclassifier import OneVsRestClassifier
 
 __all__ = [
     'OneVsRestClassifier'
 ]
+
diff --git a/src/python/nimbusml/multiclass/onevsrestclassifier.py b/src/python/nimbusml/multiclass/_onevsrestclassifier.py
similarity index 99%
rename from src/python/nimbusml/multiclass/onevsrestclassifier.py
rename to src/python/nimbusml/multiclass/_onevsrestclassifier.py
index fc9a9abe..e7d388a2 100644
--- a/src/python/nimbusml/multiclass/onevsrestclassifier.py
+++ b/src/python/nimbusml/multiclass/_onevsrestclassifier.py
@@ -13,7 +13,7 @@
 from sklearn.base import ClassifierMixin
 
 from ..base_predictor import BasePredictor
-from ..internal.core.multiclass.onevsrestclassifier import \
+from ..internal.core.multiclass._onevsrestclassifier import \
     OneVsRestClassifier as core
 from ..internal.utils.utils import trace
 
diff --git a/src/python/nimbusml/naive_bayes/__init__.py b/src/python/nimbusml/naive_bayes/__init__.py
index 22d10f3c..7852d66f 100644
--- a/src/python/nimbusml/naive_bayes/__init__.py
+++ b/src/python/nimbusml/naive_bayes/__init__.py
@@ -1,5 +1,7 @@
-from .naivebayesclassifier import NaiveBayesClassifier
+from ._naivebayesclassifier import NaiveBayesClassifier
 
 __all__ = [
     'NaiveBayesClassifier'
 ]
+
+
diff --git a/src/python/nimbusml/naive_bayes/naivebayesclassifier.py b/src/python/nimbusml/naive_bayes/_naivebayesclassifier.py
similarity index 98%
rename from src/python/nimbusml/naive_bayes/naivebayesclassifier.py
rename to src/python/nimbusml/naive_bayes/_naivebayesclassifier.py
index 5c971595..c28185e4 100644
--- a/src/python/nimbusml/naive_bayes/naivebayesclassifier.py
+++ b/src/python/nimbusml/naive_bayes/_naivebayesclassifier.py
@@ -13,7 +13,7 @@
 from sklearn.base import ClassifierMixin
 
 from ..base_predictor import BasePredictor
-from ..internal.core.naive_bayes.naivebayesclassifier import \
+from ..internal.core.naive_bayes._naivebayesclassifier import \
     NaiveBayesClassifier as core
 from ..internal.utils.utils import trace
 
diff --git a/src/python/nimbusml/preprocessing/__init__.py b/src/python/nimbusml/preprocessing/__init__.py
index e3d98fca..2af0b4b3 100644
--- a/src/python/nimbusml/preprocessing/__init__.py
+++ b/src/python/nimbusml/preprocessing/__init__.py
@@ -1,9 +1,10 @@
-from .fromkey import FromKey
-from .tokey import ToKey
-from .tensorflowscorer import TensorFlowScorer
+from ._fromkey import FromKey
+from ._tokey import ToKey
+from ._tensorflowscorer import TensorFlowScorer
 
 __all__ = [
     'FromKey',
     'ToKey',
     'TensorFlowScorer'
 ]
+
diff --git a/src/python/nimbusml/preprocessing/fromkey.py b/src/python/nimbusml/preprocessing/_fromkey.py
similarity index 96%
rename from src/python/nimbusml/preprocessing/fromkey.py
rename to src/python/nimbusml/preprocessing/_fromkey.py
index f83d90a7..29319966 100644
--- a/src/python/nimbusml/preprocessing/fromkey.py
+++ b/src/python/nimbusml/preprocessing/_fromkey.py
@@ -13,7 +13,7 @@
 from sklearn.base import TransformerMixin
 
 from ..base_transform import BaseTransform
-from ..internal.core.preprocessing.fromkey import FromKey as core
+from ..internal.core.preprocessing._fromkey import FromKey as core
 from ..internal.utils.utils import trace
 
 
diff --git a/src/python/nimbusml/preprocessing/tensorflowscorer.py b/src/python/nimbusml/preprocessing/_tensorflowscorer.py
similarity index 98%
rename from src/python/nimbusml/preprocessing/tensorflowscorer.py
rename to src/python/nimbusml/preprocessing/_tensorflowscorer.py
index d0d256bc..9327ddc9 100644
--- a/src/python/nimbusml/preprocessing/tensorflowscorer.py
+++ b/src/python/nimbusml/preprocessing/_tensorflowscorer.py
@@ -13,7 +13,7 @@
 from sklearn.base import TransformerMixin
 
 from ..base_transform import BaseTransform
-from ..internal.core.preprocessing.tensorflowscorer import \
+from ..internal.core.preprocessing._tensorflowscorer import \
     TensorFlowScorer as core
 from ..internal.utils.utils import trace
 
diff --git a/src/python/nimbusml/preprocessing/tokey.py b/src/python/nimbusml/preprocessing/_tokey.py
similarity index 98%
rename from src/python/nimbusml/preprocessing/tokey.py
rename to src/python/nimbusml/preprocessing/_tokey.py
index 4f925784..b2b7a8a1 100644
--- a/src/python/nimbusml/preprocessing/tokey.py
+++ b/src/python/nimbusml/preprocessing/_tokey.py
@@ -13,7 +13,7 @@
 from sklearn.base import TransformerMixin
 
 from ..base_transform import BaseTransform
-from ..internal.core.preprocessing.tokey import ToKey as core
+from ..internal.core.preprocessing._tokey import ToKey as core
 from ..internal.utils.utils import trace
 
 
diff --git a/src/python/nimbusml/preprocessing/filter/__init__.py b/src/python/nimbusml/preprocessing/filter/__init__.py
index 67b52df7..c089bf59 100644
--- a/src/python/nimbusml/preprocessing/filter/__init__.py
+++ b/src/python/nimbusml/preprocessing/filter/__init__.py
@@ -1,7 +1,7 @@
-from .bootstrapsampler import BootstrapSampler
-from .rangefilter import RangeFilter
-from .skipfilter import SkipFilter
-from .takefilter import TakeFilter
+from ._bootstrapsampler import BootstrapSampler
+from ._rangefilter import RangeFilter
+from ._skipfilter import SkipFilter
+from ._takefilter import TakeFilter
 
 __all__ = [
     'BootstrapSampler',
diff --git a/src/python/nimbusml/preprocessing/filter/bootstrapsampler.py b/src/python/nimbusml/preprocessing/filter/_bootstrapsampler.py
similarity index 97%
rename from src/python/nimbusml/preprocessing/filter/bootstrapsampler.py
rename to src/python/nimbusml/preprocessing/filter/_bootstrapsampler.py
index db57ebcd..a0b8fe9e 100644
--- a/src/python/nimbusml/preprocessing/filter/bootstrapsampler.py
+++ b/src/python/nimbusml/preprocessing/filter/_bootstrapsampler.py
@@ -13,7 +13,7 @@
 from sklearn.base import TransformerMixin
 
 from ...base_transform import BaseTransform
-from ...internal.core.preprocessing.filter.bootstrapsampler import \
+from ...internal.core.preprocessing.filter._bootstrapsampler import \
     BootstrapSampler as core
 from ...internal.utils.utils import trace
 
diff --git a/src/python/nimbusml/preprocessing/filter/rangefilter.py b/src/python/nimbusml/preprocessing/filter/_rangefilter.py
similarity index 97%
rename from src/python/nimbusml/preprocessing/filter/rangefilter.py
rename to src/python/nimbusml/preprocessing/filter/_rangefilter.py
index 89aa779d..d4ade4f2 100644
--- a/src/python/nimbusml/preprocessing/filter/rangefilter.py
+++ b/src/python/nimbusml/preprocessing/filter/_rangefilter.py
@@ -13,7 +13,7 @@
 from sklearn.base import TransformerMixin
 
 from ...base_transform import BaseTransform
-from ...internal.core.preprocessing.filter.rangefilter import \
+from ...internal.core.preprocessing.filter._rangefilter import \
     RangeFilter as core
 from ...internal.utils.utils import trace
 
diff --git a/src/python/nimbusml/preprocessing/filter/skipfilter.py b/src/python/nimbusml/preprocessing/filter/_skipfilter.py
similarity index 95%
rename from src/python/nimbusml/preprocessing/filter/skipfilter.py
rename to src/python/nimbusml/preprocessing/filter/_skipfilter.py
index 73b9c332..13040f05 100644
--- a/src/python/nimbusml/preprocessing/filter/skipfilter.py
+++ b/src/python/nimbusml/preprocessing/filter/_skipfilter.py
@@ -13,7 +13,8 @@
 from sklearn.base import TransformerMixin
 
 from ...base_transform import BaseTransform
-from ...internal.core.preprocessing.filter.skipfilter import SkipFilter as core
+from ...internal.core.preprocessing.filter._skipfilter import \
+    SkipFilter as core
 from ...internal.utils.utils import trace
 
 
diff --git a/src/python/nimbusml/preprocessing/filter/takefilter.py b/src/python/nimbusml/preprocessing/filter/_takefilter.py
similarity index 95%
rename from src/python/nimbusml/preprocessing/filter/takefilter.py
rename to src/python/nimbusml/preprocessing/filter/_takefilter.py
index 6fe9722d..a4eee5fe 100644
--- a/src/python/nimbusml/preprocessing/filter/takefilter.py
+++ b/src/python/nimbusml/preprocessing/filter/_takefilter.py
@@ -13,7 +13,8 @@
 from sklearn.base import TransformerMixin
 
 from ...base_transform import BaseTransform
-from ...internal.core.preprocessing.filter.takefilter import TakeFilter as core
+from ...internal.core.preprocessing.filter._takefilter import \
+    TakeFilter as core
 from ...internal.utils.utils import trace
 
 
diff --git a/src/python/nimbusml/preprocessing/missing_values/__init__.py b/src/python/nimbusml/preprocessing/missing_values/__init__.py
index 9818e4d7..7eee5984 100644
--- a/src/python/nimbusml/preprocessing/missing_values/__init__.py
+++ b/src/python/nimbusml/preprocessing/missing_values/__init__.py
@@ -1,6 +1,6 @@
-from .filter import Filter
-from .handler import Handler
-from .indicator import Indicator
+from ._filter import Filter
+from ._handler import Handler
+from ._indicator import Indicator
 
 __all__ = [
     'Filter',
diff --git a/src/python/nimbusml/preprocessing/missing_values/filter.py b/src/python/nimbusml/preprocessing/missing_values/_filter.py
similarity index 96%
rename from src/python/nimbusml/preprocessing/missing_values/filter.py
rename to src/python/nimbusml/preprocessing/missing_values/_filter.py
index 18435c13..4b8e294d 100644
--- a/src/python/nimbusml/preprocessing/missing_values/filter.py
+++ b/src/python/nimbusml/preprocessing/missing_values/_filter.py
@@ -13,7 +13,8 @@
 from sklearn.base import TransformerMixin
 
 from ...base_transform import BaseTransform
-from ...internal.core.preprocessing.missing_values.filter import Filter as core
+from ...internal.core.preprocessing.missing_values._filter import \
+    Filter as core
 from ...internal.utils.utils import trace
 
 
diff --git a/src/python/nimbusml/preprocessing/missing_values/handler.py b/src/python/nimbusml/preprocessing/missing_values/_handler.py
similarity index 98%
rename from src/python/nimbusml/preprocessing/missing_values/handler.py
rename to src/python/nimbusml/preprocessing/missing_values/_handler.py
index d390eb4a..de776ca7 100644
--- a/src/python/nimbusml/preprocessing/missing_values/handler.py
+++ b/src/python/nimbusml/preprocessing/missing_values/_handler.py
@@ -13,7 +13,7 @@
 from sklearn.base import TransformerMixin
 
 from ...base_transform import BaseTransform
-from ...internal.core.preprocessing.missing_values.handler import \
+from ...internal.core.preprocessing.missing_values._handler import \
     Handler as core
 from ...internal.utils.utils import trace
 
diff --git a/src/python/nimbusml/preprocessing/missing_values/indicator.py b/src/python/nimbusml/preprocessing/missing_values/_indicator.py
similarity index 97%
rename from src/python/nimbusml/preprocessing/missing_values/indicator.py
rename to src/python/nimbusml/preprocessing/missing_values/_indicator.py
index fdcfecc9..5299523c 100644
--- a/src/python/nimbusml/preprocessing/missing_values/indicator.py
+++ b/src/python/nimbusml/preprocessing/missing_values/_indicator.py
@@ -13,7 +13,7 @@
 from sklearn.base import TransformerMixin
 
 from ...base_transform import BaseTransform
-from ...internal.core.preprocessing.missing_values.indicator import \
+from ...internal.core.preprocessing.missing_values._indicator import \
     Indicator as core
 from ...internal.utils.utils import trace
 
diff --git a/src/python/nimbusml/preprocessing/normalization/__init__.py b/src/python/nimbusml/preprocessing/normalization/__init__.py
index 5036a49a..2c05bf41 100644
--- a/src/python/nimbusml/preprocessing/normalization/__init__.py
+++ b/src/python/nimbusml/preprocessing/normalization/__init__.py
@@ -1,8 +1,8 @@
-from .binner import Binner
-from .globalcontrastrowscaler import GlobalContrastRowScaler
-from .logmeanvariancescaler import LogMeanVarianceScaler
-from .meanvariancescaler import MeanVarianceScaler
-from .minmaxscaler import MinMaxScaler
+from ._binner import Binner
+from ._globalcontrastrowscaler import GlobalContrastRowScaler
+from ._logmeanvariancescaler import LogMeanVarianceScaler
+from ._meanvariancescaler import MeanVarianceScaler
+from ._minmaxscaler import MinMaxScaler
 
 __all__ = [
     'Binner',
diff --git a/src/python/nimbusml/preprocessing/normalization/binner.py b/src/python/nimbusml/preprocessing/normalization/_binner.py
similarity index 98%
rename from src/python/nimbusml/preprocessing/normalization/binner.py
rename to src/python/nimbusml/preprocessing/normalization/_binner.py
index 9bf0c6de..d0e78b4a 100644
--- a/src/python/nimbusml/preprocessing/normalization/binner.py
+++ b/src/python/nimbusml/preprocessing/normalization/_binner.py
@@ -13,7 +13,7 @@
 from sklearn.base import TransformerMixin
 
 from ...base_transform import BaseTransform
-from ...internal.core.preprocessing.normalization.binner import Binner as core
+from ...internal.core.preprocessing.normalization._binner import Binner as core
 from ...internal.utils.utils import trace
 
 
diff --git a/src/python/nimbusml/preprocessing/normalization/globalcontrastrowscaler.py b/src/python/nimbusml/preprocessing/normalization/_globalcontrastrowscaler.py
similarity index 98%
rename from src/python/nimbusml/preprocessing/normalization/globalcontrastrowscaler.py
rename to src/python/nimbusml/preprocessing/normalization/_globalcontrastrowscaler.py
index 28ad5a52..f124a00b 100644
--- a/src/python/nimbusml/preprocessing/normalization/globalcontrastrowscaler.py
+++ b/src/python/nimbusml/preprocessing/normalization/_globalcontrastrowscaler.py
@@ -13,7 +13,7 @@
 from sklearn.base import TransformerMixin
 
 from ...base_transform import BaseTransform
-from ...internal.core.preprocessing.normalization.globalcontrastrowscaler import \
+from ...internal.core.preprocessing.normalization._globalcontrastrowscaler import \
     GlobalContrastRowScaler as core
 from ...internal.utils.utils import trace
 
diff --git a/src/python/nimbusml/preprocessing/normalization/logmeanvariancescaler.py b/src/python/nimbusml/preprocessing/normalization/_logmeanvariancescaler.py
similarity index 98%
rename from src/python/nimbusml/preprocessing/normalization/logmeanvariancescaler.py
rename to src/python/nimbusml/preprocessing/normalization/_logmeanvariancescaler.py
index 243cec08..6f8a8669 100644
--- a/src/python/nimbusml/preprocessing/normalization/logmeanvariancescaler.py
+++ b/src/python/nimbusml/preprocessing/normalization/_logmeanvariancescaler.py
@@ -13,7 +13,7 @@
 from sklearn.base import TransformerMixin
 
 from ...base_transform import BaseTransform
-from ...internal.core.preprocessing.normalization.logmeanvariancescaler import \
+from ...internal.core.preprocessing.normalization._logmeanvariancescaler import \
     LogMeanVarianceScaler as core
 from ...internal.utils.utils import trace
 
diff --git a/src/python/nimbusml/preprocessing/normalization/meanvariancescaler.py b/src/python/nimbusml/preprocessing/normalization/_meanvariancescaler.py
similarity index 98%
rename from src/python/nimbusml/preprocessing/normalization/meanvariancescaler.py
rename to src/python/nimbusml/preprocessing/normalization/_meanvariancescaler.py
index de4f4211..b0376382 100644
--- a/src/python/nimbusml/preprocessing/normalization/meanvariancescaler.py
+++ b/src/python/nimbusml/preprocessing/normalization/_meanvariancescaler.py
@@ -13,7 +13,7 @@
 from sklearn.base import TransformerMixin
 
 from ...base_transform import BaseTransform
-from ...internal.core.preprocessing.normalization.meanvariancescaler import \
+from ...internal.core.preprocessing.normalization._meanvariancescaler import \
     MeanVarianceScaler as core
 from ...internal.utils.utils import trace
 
diff --git a/src/python/nimbusml/preprocessing/normalization/minmaxscaler.py b/src/python/nimbusml/preprocessing/normalization/_minmaxscaler.py
similarity index 98%
rename from src/python/nimbusml/preprocessing/normalization/minmaxscaler.py
rename to src/python/nimbusml/preprocessing/normalization/_minmaxscaler.py
index b3bb3c3d..0398fda8 100644
--- a/src/python/nimbusml/preprocessing/normalization/minmaxscaler.py
+++ b/src/python/nimbusml/preprocessing/normalization/_minmaxscaler.py
@@ -13,7 +13,7 @@
 from sklearn.base import TransformerMixin
 
 from ...base_transform import BaseTransform
-from ...internal.core.preprocessing.normalization.minmaxscaler import \
+from ...internal.core.preprocessing.normalization._minmaxscaler import \
     MinMaxScaler as core
 from ...internal.utils.utils import trace
 
diff --git a/src/python/nimbusml/preprocessing/schema/__init__.py b/src/python/nimbusml/preprocessing/schema/__init__.py
index 9f8ecfe4..a8dae9f8 100644
--- a/src/python/nimbusml/preprocessing/schema/__init__.py
+++ b/src/python/nimbusml/preprocessing/schema/__init__.py
@@ -1,8 +1,8 @@
-from .columnconcatenator import ColumnConcatenator
-from .columndropper import ColumnDropper
-from .columnduplicator import ColumnDuplicator
-from .columnselector import ColumnSelector
-from .typeconverter import TypeConverter
+from ._columnconcatenator import ColumnConcatenator
+from ._columndropper import ColumnDropper
+from ._columnduplicator import ColumnDuplicator
+from ._columnselector import ColumnSelector
+from ._typeconverter import TypeConverter
 
 __all__ = [
     'ColumnConcatenator',
@@ -11,3 +11,4 @@
     'ColumnSelector',
     'TypeConverter'
 ]
+
diff --git a/src/python/nimbusml/preprocessing/schema/columnconcatenator.py b/src/python/nimbusml/preprocessing/schema/_columnconcatenator.py
similarity index 97%
rename from src/python/nimbusml/preprocessing/schema/columnconcatenator.py
rename to src/python/nimbusml/preprocessing/schema/_columnconcatenator.py
index f29c6b8f..c069b984 100644
--- a/src/python/nimbusml/preprocessing/schema/columnconcatenator.py
+++ b/src/python/nimbusml/preprocessing/schema/_columnconcatenator.py
@@ -13,7 +13,7 @@
 from sklearn.base import TransformerMixin
 
 from ...base_transform import BaseTransform
-from ...internal.core.preprocessing.schema.columnconcatenator import \
+from ...internal.core.preprocessing.schema._columnconcatenator import \
     ColumnConcatenator as core
 from ...internal.utils.utils import trace
 
diff --git a/src/python/nimbusml/preprocessing/schema/columndropper.py b/src/python/nimbusml/preprocessing/schema/_columndropper.py
similarity index 96%
rename from src/python/nimbusml/preprocessing/schema/columndropper.py
rename to src/python/nimbusml/preprocessing/schema/_columndropper.py
index 34f41ea9..6ea28366 100644
--- a/src/python/nimbusml/preprocessing/schema/columndropper.py
+++ b/src/python/nimbusml/preprocessing/schema/_columndropper.py
@@ -13,7 +13,7 @@
 from sklearn.base import TransformerMixin
 
 from ...base_transform import BaseTransform
-from ...internal.core.preprocessing.schema.columndropper import \
+from ...internal.core.preprocessing.schema._columndropper import \
     ColumnDropper as core
 from ...internal.utils.utils import trace
 
diff --git a/src/python/nimbusml/preprocessing/schema/columnduplicator.py b/src/python/nimbusml/preprocessing/schema/_columnduplicator.py
similarity index 97%
rename from src/python/nimbusml/preprocessing/schema/columnduplicator.py
rename to src/python/nimbusml/preprocessing/schema/_columnduplicator.py
index 11027e80..e0a5b511 100644
--- a/src/python/nimbusml/preprocessing/schema/columnduplicator.py
+++ b/src/python/nimbusml/preprocessing/schema/_columnduplicator.py
@@ -13,7 +13,7 @@
 from sklearn.base import TransformerMixin
 
 from ...base_transform import BaseTransform
-from ...internal.core.preprocessing.schema.columnduplicator import \
+from ...internal.core.preprocessing.schema._columnduplicator import \
     ColumnDuplicator as core
 from ...internal.utils.utils import trace
 
diff --git a/src/python/nimbusml/preprocessing/schema/columnselector.py b/src/python/nimbusml/preprocessing/schema/_columnselector.py
similarity index 96%
rename from src/python/nimbusml/preprocessing/schema/columnselector.py
rename to src/python/nimbusml/preprocessing/schema/_columnselector.py
index d01e8435..984a79cd 100644
--- a/src/python/nimbusml/preprocessing/schema/columnselector.py
+++ b/src/python/nimbusml/preprocessing/schema/_columnselector.py
@@ -13,7 +13,7 @@
 from sklearn.base import TransformerMixin
 
 from ...base_transform import BaseTransform
-from ...internal.core.preprocessing.schema.columnselector import \
+from ...internal.core.preprocessing.schema._columnselector import \
     ColumnSelector as core
 from ...internal.utils.utils import trace
 
diff --git a/src/python/nimbusml/preprocessing/schema/typeconverter.py b/src/python/nimbusml/preprocessing/schema/_typeconverter.py
similarity index 96%
rename from src/python/nimbusml/preprocessing/schema/typeconverter.py
rename to src/python/nimbusml/preprocessing/schema/_typeconverter.py
index 32cea7a1..b8224e18 100644
--- a/src/python/nimbusml/preprocessing/schema/typeconverter.py
+++ b/src/python/nimbusml/preprocessing/schema/_typeconverter.py
@@ -13,7 +13,7 @@
 from sklearn.base import TransformerMixin
 
 from ...base_transform import BaseTransform
-from ...internal.core.preprocessing.schema.typeconverter import \
+from ...internal.core.preprocessing.schema._typeconverter import \
     TypeConverter as core
 from ...internal.utils.utils import trace
 
diff --git a/src/python/nimbusml/preprocessing/text/__init__.py b/src/python/nimbusml/preprocessing/text/__init__.py
index b255f350..c312a30e 100644
--- a/src/python/nimbusml/preprocessing/text/__init__.py
+++ b/src/python/nimbusml/preprocessing/text/__init__.py
@@ -1,5 +1,5 @@
-from .chartokenizer import CharTokenizer
+from ._chartokenizer import CharTokenizer
 
 __all__ = [
     'CharTokenizer'
-]
+]
\ No newline at end of file
diff --git a/src/python/nimbusml/preprocessing/text/chartokenizer.py b/src/python/nimbusml/preprocessing/text/_chartokenizer.py
similarity index 97%
rename from src/python/nimbusml/preprocessing/text/chartokenizer.py
rename to src/python/nimbusml/preprocessing/text/_chartokenizer.py
index 76215fa8..78c61555 100644
--- a/src/python/nimbusml/preprocessing/text/chartokenizer.py
+++ b/src/python/nimbusml/preprocessing/text/_chartokenizer.py
@@ -13,7 +13,7 @@
 from sklearn.base import TransformerMixin
 
 from ...base_transform import BaseTransform
-from ...internal.core.preprocessing.text.chartokenizer import \
+from ...internal.core.preprocessing.text._chartokenizer import \
     CharTokenizer as core
 from ...internal.utils.utils import trace
 
diff --git a/src/python/nimbusml/tests/feature_extraction/text/test_sentiment.py b/src/python/nimbusml/tests/feature_extraction/text/test_sentiment.py
index 3b56296b..02095746 100644
--- a/src/python/nimbusml/tests/feature_extraction/text/test_sentiment.py
+++ b/src/python/nimbusml/tests/feature_extraction/text/test_sentiment.py
@@ -19,7 +19,7 @@ class TestSentiment(unittest.TestCase):
 
     @unittest.skip(
         "BUG: Error: *** System.InvalidOperationException: 'resourcePath', "
-        "issue with ML.NET")
+        "issue with ML.Net")
     def test_sentiment(self):
         # Bug 142794
         data = pd.DataFrame({"Sentiment": [0,
diff --git a/src/python/nimbusml/tests/linear_model/test_symsgdbinaryclassifier.py b/src/python/nimbusml/tests/linear_model/test_symsgdbinaryclassifier.py
index 2d96a517..1d065544 100644
--- a/src/python/nimbusml/tests/linear_model/test_symsgdbinaryclassifier.py
+++ b/src/python/nimbusml/tests/linear_model/test_symsgdbinaryclassifier.py
@@ -15,7 +15,7 @@
 
 class TestSymSgdBinaryClassifier(unittest.TestCase):
 
-    @unittest.skip("BUG: Not included in ML.NET yet")
+    @unittest.skip("BUG: Not included in Ml.net yet")
     def test_SymSgdBinaryClassifier(self):
         np.random.seed(0)
         df = get_dataset("infert").as_df()
diff --git a/src/python/nimbusml/tests/metrics/test_metrics.py b/src/python/nimbusml/tests/metrics/test_metrics.py
index 274e1ebb..ee4d8393 100644
--- a/src/python/nimbusml/tests/metrics/test_metrics.py
+++ b/src/python/nimbusml/tests/metrics/test_metrics.py
@@ -216,7 +216,7 @@ def test_metrics_evaluate_clusterer(self):
             err_msg="AvgMinScore  should be %s" %
                     0.014)
 
-    @unittest.skip('ML.NET does not have svm')
+    @unittest.skip('ML.Net does not have svm')
     def test_metrics_evaluate_anomalydetection(self):
         np.random.seed(0)
         df = get_dataset("iris").as_df().drop(['Label', 'Species'], axis=1)
@@ -441,9 +441,9 @@ def test_metrics_evaluate_binary_sklearn(self):
         aucsksc = auc(recall, precision)
         print(aucnimbusml, aucskpr, aucsksc)
         assert aucskpr == aucsksc
-        # ML.NET: 0.980114
+        # MLNET: 0.980114
         # SKL: 0.9667731012859688
-        # ML.NET computes the AUC as the probability that the score
+        # MLNET computes the AUC as the probability that the score
         # for a positive example is higher than the score for a negative
         # example.
         # https://github.com/dotnet/machinelearning/blob/master/src/
diff --git a/src/python/nimbusml/tests/pipeline/test_score_method.py b/src/python/nimbusml/tests/pipeline/test_score_method.py
index 37ce45b4..bdea8be8 100644
--- a/src/python/nimbusml/tests/pipeline/test_score_method.py
+++ b/src/python/nimbusml/tests/pipeline/test_score_method.py
@@ -102,7 +102,7 @@ def test_score_clusterer(self):
             err_msg="NMI loss should be %s" %
                     0.36840763005544264)
 
-    @unittest.skip("BUG: Not included in ML.NET yet")
+    @unittest.skip("BUG: Not included in Ml.net yet")
     def test_score_anomalydetection(self):
         np.random.seed(0)
         df = get_dataset("iris").as_df().drop(['Label', 'Species'], axis=1)
diff --git a/src/python/nimbusml/tests/test_syntax_expected_failures.py b/src/python/nimbusml/tests/test_syntax_expected_failures.py
index 916cf8be..e4e84158 100644
--- a/src/python/nimbusml/tests/test_syntax_expected_failures.py
+++ b/src/python/nimbusml/tests/test_syntax_expected_failures.py
@@ -11,7 +11,7 @@
 from nimbusml.feature_extraction.categorical import OneHotVectorizer
 from nimbusml.internal.utils.data_roles import Role
 from nimbusml.linear_model import FastLinearRegressor
-from nimbusml.pipeline import TrainedWarning
+from nimbusml._pipeline import TrainedWarning
 
 if six.PY2:
     pass
diff --git a/src/python/nimbusml/tests/utils/test_exports.py b/src/python/nimbusml/tests/utils/test_exports.py
index 3dcaf7e3..e83de8dc 100644
--- a/src/python/nimbusml/tests/utils/test_exports.py
+++ b/src/python/nimbusml/tests/utils/test_exports.py
@@ -449,7 +449,7 @@ def test_get_fit_info_clustering(self):
         assert out == ['PredictedLabel', 'Score.0', 'Score.1', 'Score.2']
         assert len(scores) == 9
 
-    @unittest.skip('ML.NET does not have svm')
+    @unittest.skip('ML.Net does not have svm')
     def test_get_fit_info_anomaly(self):
         df = get_dataset("iris").as_df()
         df.drop(['Label', 'Setosa', 'Species'], axis=1, inplace=True)
diff --git a/src/python/setup.py b/src/python/setup.py
index 7270fcdc..5f127ec2 100644
--- a/src/python/setup.py
+++ b/src/python/setup.py
@@ -51,7 +51,7 @@
 
     # Author details
     author='Microsoft',
-    author_email='nimbusml@microsoft.com',
+    author_email='pytlc@microsoft.com',
 
     # Choose your license
     license='All rights reserved',
diff --git a/src/python/setup.py.in b/src/python/setup.py.in
index 5262e5c1..f006da84 100644
--- a/src/python/setup.py.in
+++ b/src/python/setup.py.in
@@ -51,7 +51,7 @@ setup(
 
     # Author details
     author='Microsoft',
-    author_email='nimbusml@microsoft.com',
+    author_email='pytlc@microsoft.com',
 
     # Choose your license
     license='All rights reserved',
diff --git a/src/python/tools/entrypoint_compiler.py b/src/python/tools/entrypoint_compiler.py
index d437f5ae..0bd8cbb8 100644
--- a/src/python/tools/entrypoint_compiler.py
+++ b/src/python/tools/entrypoint_compiler.py
@@ -185,7 +185,7 @@ def write_api(entrypoint, kind="node", pkg_path=None, overwrite=False):
     class_name = entrypoint['NewName']
     class_dir = entrypoint['Module']
     class_type = entrypoint['Type']
-    class_file = class_name.lower()
+    class_file = '_' + class_name.lower()
 
     doc_builder = DocBuilder()
     doc_builder.class_name = class_name
diff --git a/src/python/tools/update_nimbusml_version.py b/src/python/tools/update_nimbusml_version.py
index fad789c9..1ba7f2b6 100644
--- a/src/python/tools/update_nimbusml_version.py
+++ b/src/python/tools/update_nimbusml_version.py
@@ -9,7 +9,7 @@
 
 # run this file to update the ML.NET version in all the necessary files:
 #   * double click it in File Explorer, or
-#   * run it directly on Command Prompt, e.g., !python update_nimbusml_version.py
+#   * run it directly on Command Prompt, e.g., !python update_mlnet_version.py
 # see the bottom section of this file for details about this updating process.
 
 import os

From 34721baa6274c64d3d897bd75cf78c32969ca6aa Mon Sep 17 00:00:00 2001
From: Gani Nazirov <ganaziro@microsoft.com>
Date: Fri, 19 Oct 2018 10:42:48 -0700
Subject: [PATCH 2/4] Move to Hosted Mac pool

---
 .vsts-ci.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index c7977486..32fd8737 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -28,10 +28,7 @@ phases:
       Py27:
         _configuration: RlsMacPy2.7
     buildQueue:
-      name: RevolutionR
-      timeoutInMinutes: 180
-      demands:
-      - ShipRTag -equals macos-vs2017
+      name: Hosted macOS
 
 # Build all configurations for Linux
   # Run tests on Ubuntu16

From 6386313b6778fa8aaa38e5bd3ff115f12bd42cea Mon Sep 17 00:00:00 2001
From: Gani Nazirov <ganinz@hotmail.com>
Date: Fri, 19 Oct 2018 11:10:43 -0700
Subject: [PATCH 3/4] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 21dc5a39..c98faa35 100644
--- a/README.md
+++ b/README.md
@@ -66,5 +66,5 @@ We welcome [contributions](docs/project-docs/contributing.md)!
 
 ## License
 
-ML.NET for Python is licensed under the [MIT license](LICENSE).
+NimbusML is licensed under the [MIT license](LICENSE).
 

From 4c5fda3acc2d7113522c2e41fd05dc4ad0fbde1f Mon Sep 17 00:00:00 2001
From: Monte Hoover <mohoov@microsoft.com>
Date: Fri, 19 Oct 2018 17:08:19 -0700
Subject: [PATCH 4/4] Manually copied naming changes over from master.

---
 .gitignore                                     |  1 +
 README.md                                      |  4 ++--
 build/ci/phase-template.yml                    |  3 ++-
 build/signed_build_phase.yml                   |  4 ++--
 docs/README.md                                 | 10 +++++-----
 docs/developers/developer-guide.md             |  6 +++---
 docs/developers/linux-build.md                 |  6 +++---
 docs/developers/mac-build.md                   |  4 ++--
 docs/developers/windows-build.md               |  4 ++--
 docs/project-docs/contributing.md              |  6 +++---
 docs/project-docs/style-guide.md               |  4 ++--
 src/DotNetBridge/Bridge.cs                     |  2 +-
 src/NativeBridge/dllmain.cpp                   |  8 ++++----
 src/python/docs/sphinx/concepts/columns.rst    |  4 ++--
 .../sphinx/concepts/experimentvspipeline.rst   |  2 +-
 src/python/docs/sphinx/concepts/roles.rst      |  4 ++--
 src/python/docs/sphinx/concepts/schema.rst     |  6 +++---
 src/python/docs/sphinx/concepts/types.rst      |  4 ++--
 src/python/docs/sphinx/index.rst               | 10 +++++-----
 src/python/docs/sphinx/installationguide.rst   |  8 ++++----
 src/python/docs/sphinx/metrics.rst             |  2 +-
 src/python/docs/sphinx/overview.rst            |  2 +-
 src/python/docs/sphinx/toc.yml                 | 18 +++++++++---------
 src/python/nimbusml/examples/Sentiment.py      |  2 +-
 .../WordEmbedding_df.py                        |  2 +-
 .../feature_extraction/text/test_sentiment.py  |  2 +-
 .../test_symsgdbinaryclassifier.py             |  2 +-
 .../nimbusml/tests/metrics/test_metrics.py     |  6 +++---
 .../tests/pipeline/test_score_method.py        |  2 +-
 .../nimbusml/tests/utils/test_exports.py       |  2 +-
 src/python/setup.py                            |  2 +-
 src/python/setup.py.in                         |  2 +-
 src/python/tools/update_nimbusml_version.py    |  2 +-
 33 files changed, 74 insertions(+), 72 deletions(-)

diff --git a/.gitignore b/.gitignore
index c0afbf43..45ca6fa4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -346,3 +346,4 @@ _doc_report.txt
 .pytest_cache/
 data.csv
 data.txt
+
diff --git a/README.md b/README.md
index c98faa35..04f29538 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ ML.NET was originally developed in Microsoft Research and is used across many pr
 
 This package enables training ML.NET pipelines or integrating ML.NET components directly into Scikit-Learn pipelines (it supports  `numpy.ndarray`, `scipy.sparse_cst`, and `pandas.DataFrame` as inputs).
 
-Documentation can be found [here](https://docs.microsoft.com/en-us/nimbusml/overview) with additional [notebook samples](https://github.com/Microsoft/ML.NET-for-Python-Samples).
+Documentation can be found [here](https://docs.microsoft.com/en-us/NimbusML/overview) with additional [notebook samples](https://github.com/Microsoft/NimbusML-Samples).
 
 ## Installation
 
@@ -53,7 +53,7 @@ results = pipeline.predict(data)
 
 
 
-Many additional examples and tutorials can be found in the [documentation](https://docs.microsoft.com/en-us/nimbusml/overview).
+Many additional examples and tutorials can be found in the [documentation](https://docs.microsoft.com/en-us/NimbusML/overview).
 
 
 ## Building
diff --git a/build/ci/phase-template.yml b/build/ci/phase-template.yml
index 40962628..58022807 100644
--- a/build/ci/phase-template.yml
+++ b/build/ci/phase-template.yml
@@ -24,6 +24,7 @@ phases:
     - script: $(_buildScript) --configuration $(_configuration) --runTests
   # Mac phases
   - ${{ if eq(parameters.name, 'Mac') }}:
+    - script: brew install gcc
     - script: chmod 777 $(_buildScript) && $(_buildScript) --configuration $(_configuration) --runTests
   # Linux phases
   - ${{ if ne(parameters.testDistro, '') }}:
@@ -48,5 +49,5 @@ phases:
       displayName: Publish wheel file to VSTS artifacts
       inputs:
         pathToPublish: $(Build.SourcesDirectory)/target
-        artifactName: Mlnet Wheels
+        artifactName: NimbusML Wheels
         artifactType: container
diff --git a/build/signed_build_phase.yml b/build/signed_build_phase.yml
index 0b29a440..9d5288c4 100644
--- a/build/signed_build_phase.yml
+++ b/build/signed_build_phase.yml
@@ -55,7 +55,7 @@ phases:
     displayName: Copy wheel file to Staging Directory in preparation for publishing 
     inputs:
       SourceFolder: $(Build.SourcesDirectory)/target
-      Contents: mlnet-*.whl
+      Contents: nimbusml-*.whl
       TargetFolder: $(Build.StagingDirectory)/artifacts
 
   - task: PublishBuildArtifacts@1
@@ -63,5 +63,5 @@ phases:
     displayName: Publish wheel file to VSTS artifacts
     inputs:
       pathToPublish: $(Build.StagingDirectory)/artifacts
-      artifactName: Mlnet Wheels
+      artifactName: NimbusML Wheels
       artifactType: container
\ No newline at end of file
diff --git a/docs/README.md b/docs/README.md
index eef214ad..17859fe9 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,15 +1,15 @@
 Documents Index
 ===============
 
-Intro to mlnet
+Intro to NimbusML
 ===============
 
-`mlnet` provides state-of-the-art ML algorithms, transforms and components, aiming to make them useful for all developers, data scientists, and information workers and helpful in all products, services and devices.
+NimbusML provides state-of-the-art ML algorithms, transforms and components, aiming to make them useful for all developers, data scientists, and information workers and helpful in all products, services and devices.
 
 Project Docs
 ============
 
-- [API](https://docs.microsoft.com/en-us/mlnet/overview)
-- [Tutorials](https://docs.microsoft.com/en-us/mlnet/tutorials)
+- [API](https://docs.microsoft.com/en-us/nimbusml/overview)
+- [Tutorials](https://docs.microsoft.com/en-us/nimbusml/tutorials)
 - [Developer Guide](developers/developer-guide.md)
-- [Contributing to ML.NET](project-docs/contributing.md)
+- [Contributing to ML.NET](project-docs/contributing.md)
\ No newline at end of file
diff --git a/docs/developers/developer-guide.md b/docs/developers/developer-guide.md
index 81dd7e7f..83053655 100644
--- a/docs/developers/developer-guide.md
+++ b/docs/developers/developer-guide.md
@@ -1,13 +1,13 @@
 Developer Guide
 ===============
 
-`mlnet` runs on Windows, Linux, and macOS and supports Python 3.6, 3.5, and 2.7, 64 bit versions only.  It has been tested on Windows 10, MacOS 10.13, Ubuntu 14.04, Ubuntu 16.04, Ubuntu 18.04, CentOS 7, and RHEL 7.
+NimbusML runs on Windows, Linux, and macOS and supports Python 3.6, 3.5, and 2.7, 64 bit versions only.  It has been tested on Windows 10, MacOS 10.13, Ubuntu 14.04, Ubuntu 16.04, Ubuntu 18.04, CentOS 7, and RHEL 7.
 
 Building the repository
 =======================
 
-The `mlnet` repo can be built directly from a terminal or cmd prompt. See the platform-specific build instructions for your dev environment:
+The NimbusML repo can be built directly from a terminal or cmd prompt. See the platform-specific build instructions for your dev environment:
 
 | [Windows](windows-build.md) | [Linux](linux-build.md) | [Mac](mac-build.md) |
 
-`mlnet` official builds are produced in Azure Dev Ops, as specified by the file `.vsts-ci.yml`.
\ No newline at end of file
+Nimbus official builds are produced in Azure Dev Ops, as specified by the file `.vsts-ci.yml`.
\ No newline at end of file
diff --git a/docs/developers/linux-build.md b/docs/developers/linux-build.md
index 9e5982c8..5fb582e5 100644
--- a/docs/developers/linux-build.md
+++ b/docs/developers/linux-build.md
@@ -1,4 +1,4 @@
-Building `mlnet` from source on Linux
+Building NimbusML from source on Linux
 ==========================================
 ## Prerequisites
 1. gcc >= 5.4
@@ -12,9 +12,9 @@ Building `mlnet` from source on Linux
 ## Build
 Run `./build.sh`
 
-This downloads dependencies (.NET SDK, specific versions of Python and Boost), builds native code and managed code, and packages `mlnet` into a pip-installable wheel. This produces debug binaries by default, and release versions can be specified by `./build.sh --configuration RlsLinPy3.6` for examle.
+This downloads dependencies (.NET SDK, specific versions of Python and Boost), builds native code and managed code, and packages NimbusML into a pip-installable wheel. This produces debug binaries by default, and release versions can be specified by `./build.sh --configuration RlsLinPy3.6` for examle.
 
 For additional options including running tests and building components independently, see `./build.sh -h`.
 
 ### Known Issues
-The LightGBM estimator fails on Linux when building from source. The official `mlnet` Linux wheel package on Pypi.org has a working version of LightGBM.
\ No newline at end of file
+The LightGBM estimator fails on Linux when building from source. The official NimbusML Linux wheel package on Pypi.org has a working version of LightGBM.
\ No newline at end of file
diff --git a/docs/developers/mac-build.md b/docs/developers/mac-build.md
index eec81b7d..f2e8b637 100644
--- a/docs/developers/mac-build.md
+++ b/docs/developers/mac-build.md
@@ -1,4 +1,4 @@
-Building `mlnet` from source on Mac
+Building NimbusML from source on Mac
 ==========================================
 ## Prerequisites
 1. Xcode Command Line Tools (for Clang compiler)
@@ -7,7 +7,7 @@ Building `mlnet` from source on Mac
 ## Build
 Run `./build.sh`
 
-This downloads dependencies (.NET SDK, specific versions of Python and Boost), builds native code and managed code, and packages `mlnet` into a pip-installable wheel. This produces debug binaries by default, and release versions can be specified by `./build.sh --configuration RlsMacPy3.6` for examle.
+This downloads dependencies (.NET SDK, specific versions of Python and Boost), builds native code and managed code, and packages NimbusML into a pip-installable wheel. This produces debug binaries by default, and release versions can be specified by `./build.sh --configuration RlsMacPy3.6` for examle.
 
 For additional options including running tests and building components independently, see `./build.sh -h`.
 
diff --git a/docs/developers/windows-build.md b/docs/developers/windows-build.md
index a247bf6e..40dfd602 100644
--- a/docs/developers/windows-build.md
+++ b/docs/developers/windows-build.md
@@ -1,4 +1,4 @@
-Building `mlnet` from source on Windows
+Building NimbusML from source on Windows
 ==========================================
 ## Prerequisites
 1. Visual Studio 2015 or higher
@@ -7,6 +7,6 @@ Building `mlnet` from source on Windows
 ## Build
 Run `build.cmd`
 
-This downloads dependencies (.NET SDK, specific versions of Python and Boost), builds native code and managed code, and packages `mlnet` into a pip-installable wheel. This produces debug binaries by default, and release versions can be specified by `build.cmd --configuration RlsWinPy3.6` for examle.
+This downloads dependencies (.NET SDK, specific versions of Python and Boost), builds native code and managed code, and packages NimbusML into a pip-installable wheel. This produces debug binaries by default, and release versions can be specified by `build.cmd --configuration RlsWinPy3.6` for examle.
 
 For additional options including running tests and building components independently, see `build.cmd -?`.
diff --git a/docs/project-docs/contributing.md b/docs/project-docs/contributing.md
index 55897725..c6aa83a6 100644
--- a/docs/project-docs/contributing.md
+++ b/docs/project-docs/contributing.md
@@ -1,14 +1,14 @@
 # Welcome!
 
-If you are here, it means you are interested in helping us out. A hearty welcome and thank you! There are many ways you can contribute to the `mlnet` project:
+If you are here, it means you are interested in helping us out. A hearty welcome and thank you! There are many ways you can contribute to the NimbusML project:
 
 * Offer PRs to fix bugs or implement new features.
 * Give us feedback and bug reports regarding the software or the documentation.
 * Improve our examples, tutorials, and documentation.
 
-### mlnet and ML.NET
+### NimbusML and ML.NET
 
-`mlnet` provides Python bindings for the [ML.NET](https://www.microsoft.com/net/learn/apps/machine-learning-and-ai/ml-dotnet) library of machine learning algorithms. If you would like to contribute to the underlying library of algorithms, please check out [ML.NET](https://www.microsoft.com/net/learn/apps/machine-learning-and-ai/ml-dotnet).  If you would like to contribute to the `mlnet` python bindings project, please read on.
+NimbusML provides Python bindings for the [ML.NET](https://www.microsoft.com/net/learn/apps/machine-learning-and-ai/ml-dotnet) library of machine learning algorithms. If you would like to contribute to the underlying library of algorithms, please check out [ML.NET](https://www.microsoft.com/net/learn/apps/machine-learning-and-ai/ml-dotnet).  If you would like to contribute to the NimbusML python bindings project, please read on.
 
 ## New Contributers
 
diff --git a/docs/project-docs/style-guide.md b/docs/project-docs/style-guide.md
index 64a77372..5aeab21f 100644
--- a/docs/project-docs/style-guide.md
+++ b/docs/project-docs/style-guide.md
@@ -1,12 +1,12 @@
 Contributing to Machine Learning
 ======================
 
-This document describes contribution guidelines that are specific to `mlnet`. Please read [Python Style Guide](https://www.python.org/dev/peps/pep-0008/) for more general Python style guidelines.
+This document describes contribution guidelines that are specific to NimbusML. Please read [Python Style Guide](https://www.python.org/dev/peps/pep-0008/) for more general Python style guidelines.
 
 Coding Style Changes
 --------------------
 
-We intend to bring `mlnet` into full conformance with the style guidelines described in [Python Style Guide](https://www.python.org/dev/peps/pep-0008/). We plan to do that with tooling, in a holistic way. In the meantime, please:
+We intend to bring NimbusML into full conformance with the style guidelines described in [Python Style Guide](https://www.python.org/dev/peps/pep-0008/). We plan to do that with tooling, in a holistic way. In the meantime, please:
 
 * **DO NOT** send PRs for style changes. For example, do not send PRs that are focused on changing usage of ```Int32``` to ```int```.
 * **DO NOT** send PRs for upgrading code to use newer language features, though it's ok to use newer language features as part of new code that's written.  For example, it's ok to use expression-bodied members as part of new code you write, but do not send a PR focused on changing existing properties or methods to use the feature.
diff --git a/src/DotNetBridge/Bridge.cs b/src/DotNetBridge/Bridge.cs
index 64326c5e..e72c20b9 100644
--- a/src/DotNetBridge/Bridge.cs
+++ b/src/DotNetBridge/Bridge.cs
@@ -310,7 +310,7 @@ private static unsafe int GenericExec(EnvironmentBlock* penv, sbyte* psz, int cd
             using (var env = new RmlEnvironment(MarshalDelegate<CheckCancelled>(penv->checkCancel), penv->seed,
                     verbose: penv != null && penv->verbosity > 3, conc: penv != null ? penv->maxThreadsAllowed : 0))
             {
-                var host = env.Register("MlNetExecution");
+                var host = env.Register("ML.NET_Execution");
                 env.ComponentCatalog.RegisterAssembly(typeof(TextLoader).Assembly); // ML.Data
                 env.ComponentCatalog.RegisterAssembly(typeof(LinearPredictor).Assembly); // ML.StandardLearners
                 env.ComponentCatalog.RegisterAssembly(typeof(CategoricalTransform).Assembly); // ML.Transforms
diff --git a/src/NativeBridge/dllmain.cpp b/src/NativeBridge/dllmain.cpp
index 526e4aaf..9965fe7b 100644
--- a/src/NativeBridge/dllmain.cpp
+++ b/src/NativeBridge/dllmain.cpp
@@ -9,7 +9,7 @@
 #define PARAM_SEED "seed"
 #define PARAM_GRAPH "graph"
 #define PARAM_VERBOSE "verbose"
-#define PARAM_MLNET_PATH "nimbusmlPath"
+#define PARAM_NIMBUSML_PATH "nimbusmlPath"
 #define PARAM_DATA "data"
 
 #define WIN_FOLDER L"\\Win"
@@ -70,13 +70,13 @@ bp::dict pxCall(bp::dict& params)
 	try
 	{
 		bp::extract<std::string> graph(params[PARAM_GRAPH]);
-		bp::extract<std::string> nimbusmlPath(params[PARAM_MLNET_PATH]);
+		bp::extract<std::string> nimbusmlPath(params[PARAM_NIMBUSML_PATH]);
 		bp::extract<std::int32_t> verbose(params[PARAM_VERBOSE]);
 		std::int32_t i_verbose = std::int32_t(verbose);
 		std::string s_nimbusmlPath = std::string(nimbusmlPath);
 		std::string s_graph = std::string(graph);
-		const char *path = s_nimbusmlPath.c_str();  // nimbusmlPath
-		const char *coreclrpath = s_nimbusmlPath.c_str();  // mlnet core clr
+		const char *path = s_nimbusmlPath.c_str();
+		const char *coreclrpath = s_nimbusmlPath.c_str();
 
 		GENERICEXEC exec = EnsureExec(path, coreclrpath);
 		if (exec == nullptr)
diff --git a/src/python/docs/sphinx/concepts/columns.rst b/src/python/docs/sphinx/concepts/columns.rst
index 55959964..ca051494 100644
--- a/src/python/docs/sphinx/concepts/columns.rst
+++ b/src/python/docs/sphinx/concepts/columns.rst
@@ -17,7 +17,7 @@ How To Select Columns to Transform
 ``transform()`` and ``fit_transform()`` methods of trainers and transforms. By default, all
 columns are transformed equally.
 
-``nimbusml`` additionally provides a syntax to transform only a subset of columns. This is a useful
+NimbusML additionally provides a syntax to transform only a subset of columns. This is a useful
 feature for many transforms, especially when the dataset containts columns of mixed types. For
 example, a dataset with both numeric features and free text features. Similarly for trainers, the
 concept of :ref:`roles` provides a mechanism to select which columns to use as labels and features.
@@ -55,7 +55,7 @@ What if we only want to encode one of the columns? We simply use the ``<<`` oper
 transform to restrict operations to the columns of interest. The ``<<`` operatator is syntactic
 sugar for setting the ``columns`` argument of the transform.
 
-All transforms in ``nimbusml`` have an implicit ``columns`` parameter to tell which columns to process,
+All transforms in NimbusML have an implicit ``columns`` parameter to tell which columns to process,
 and optionally how to name the output columns, if any. Refer to the reference sections for each
 transform to see what format is allowed for the ``columns`` argument.
 
diff --git a/src/python/docs/sphinx/concepts/experimentvspipeline.rst b/src/python/docs/sphinx/concepts/experimentvspipeline.rst
index 25510a01..c0e3116c 100644
--- a/src/python/docs/sphinx/concepts/experimentvspipeline.rst
+++ b/src/python/docs/sphinx/concepts/experimentvspipeline.rst
@@ -64,7 +64,7 @@ operations.
 Optimized Chaining of Trainers/Transforms
 """""""""""""""""""""""""""""""""""""""""
 
-Using ``nimbusml``, trainers and transforms within a :py:class:`nimbusml.Pipeline` will
+Using NimbusML, trainers and transforms within a :py:class:`nimbusml.Pipeline` will
 generally result in better performance compared to using them in a
 `sklearn.Pipeline <http://scikit-learn.org/stable/modules/generated/sklearn.pipeline.Pipeline.html>`_.
 Data copying is minimized when processing is limited to within the C# libraries, and if all
diff --git a/src/python/docs/sphinx/concepts/roles.rst b/src/python/docs/sphinx/concepts/roles.rst
index daea4334..c76330f4 100644
--- a/src/python/docs/sphinx/concepts/roles.rst
+++ b/src/python/docs/sphinx/concepts/roles.rst
@@ -14,7 +14,7 @@ Column Roles for Trainers
 Roles and Learners
 ------------------
 
-Columns play different roles in the context of trainers. ``nimbusml`` supports the following roles, as defined in :py:class:`nimbusml.Role`
+Columns play different roles in the context of trainers. NimbusML supports the following roles, as defined in :py:class:`nimbusml.Role`
 
 * Role.Label - the column representing the dependent variable.
 * Role.Feature - the column(s) representing the independent variable(s).
@@ -126,7 +126,7 @@ Example of GroupId Role
 
 Same goes for the group. Rankers needs the GroupId to link rows to rank. A ranker for search engine needs a
 dataset with a row per displayed result. The GroupId is ued to tell the learner which results belong to the
-same query, to group together the candidate set of documents for a single query. ``nimbusml`` needs features,
+same query, to group together the candidate set of documents for a single query. NimbusML needs features,
 a target (relevance label of the result) and a GroupId.
 
 Below is an example of using GroupId at the trainer.
diff --git a/src/python/docs/sphinx/concepts/schema.rst b/src/python/docs/sphinx/concepts/schema.rst
index b04b1dde..7c67a999 100644
--- a/src/python/docs/sphinx/concepts/schema.rst
+++ b/src/python/docs/sphinx/concepts/schema.rst
@@ -16,13 +16,13 @@ Schema
 Introduction to Schema
 ----------------------
 
-The ``nimbusml`` data framework relies on a schema to understand the column names and mix of column
+The NimbusML data framework relies on a schema to understand the column names and mix of column
 types in the dataset, which may originate from any of the supported :ref:`datasources`. It is 
 automatically inferred when a :py:class:`nimbusml.FileDataStream` or :py:class:`nimbusml.DataSchema` is created.
 
 Transforms have the ability to operate on subsets of columns in the dataset, as well as alter the
 resulting output schema, which effects other transforms downstream. For users, it would be very useful to 
-understand how ``nimbusml`` processes the data in a pipeline for debugging purposes or training the model with :py:class:`nimbusml.FileDataStream`.
+understand how NimbusML processes the data in a pipeline for debugging purposes or training the model with :py:class:`nimbusml.FileDataStream`.
 
 The schema comes with two formats for its representation, (1) object representation and (2) string format. After generating a :py:class:`nimbusml.FileDataStream`, users can view the 
 object representation of the schema by using ``repr()`` function:
@@ -168,7 +168,7 @@ all of types R8, I8 and TX, with column names *X1*, *X2* and *X3*.
 Example of Schema for a File
 """"""""""""""""""""""""""""""""""""""
 
-The transforms and trainers in ``nimbusml`` support various :ref:`datasources` as inputs.
+The transforms and trainers in NimbusML support various :ref:`datasources` as inputs.
 When the data is in a ``pandas.DataFrame``, the schema is inferred automatically from the
 ``dtype`` of the columns.
 
diff --git a/src/python/docs/sphinx/concepts/types.rst b/src/python/docs/sphinx/concepts/types.rst
index ff60d85c..e1d53858 100644
--- a/src/python/docs/sphinx/concepts/types.rst
+++ b/src/python/docs/sphinx/concepts/types.rst
@@ -15,7 +15,7 @@ Types
 Column Types
 ------------
 
-``nimbusml`` wraps a library written in C#, which is a strongly typed language. Columns of the input data sources are ascribed a type, which is used by
+NimbusML wraps a library written in C#, which is a strongly typed language. Columns of the input data sources are ascribed a type, which is used by
 transforms and trainers to decide if they can operate on that column. Some transforms may only allow
 text data types, while others only numeric. Trainers almost exclusively require the features and
 labels to be of a numeric type.
@@ -41,7 +41,7 @@ VectorType Columns
 A VectorType column contains a vector of values of a homogenous type, and is associated with a
 ``column_name``.
 
-The following table shows how ``nimbusml`` processes a dataset:
+The following table shows how NimbusML processes a dataset:
 
 .. image:: ../_static/images/table_car.png
 The third column is a VectorType column named *Features* with 10 ``slots``. A VectorType column can
diff --git a/src/python/docs/sphinx/index.rst b/src/python/docs/sphinx/index.rst
index 2f696abd..f617d28a 100644
--- a/src/python/docs/sphinx/index.rst
+++ b/src/python/docs/sphinx/index.rst
@@ -9,7 +9,7 @@ ML.NET for Python
 Getting Started
 ===============
 
-``nimbusml`` is a Python module that provides experimental Python bindings for [ML.NET](https://www.microsoft.com/net/learn/apps/machine-learning-and-ai/ml-dotnet). 
+NimbusML is a Python module that provides experimental Python bindings for [ML.NET](https://www.microsoft.com/net/learn/apps/machine-learning-and-ai/ml-dotnet). 
 It provides battle-tested state-of-the-art ML algorithms, transforms and components,
 aiming to make them useful for all developers, data scientists, and information
 workers and helpful in all products, services and devices. The components are
@@ -18,21 +18,21 @@ Bing and other teams at Microsoft.
 
 ``nimbusml`` is interoperable with ``scikit-learn`` estimators and transforms, while adding 
 a suite of highly optimized algorithms written in C++ and C# for speed and performance. 
-``nimbusml`` trainers and transforms support the following data structures for the ``fit()`` and ``transform()`` methods:
+NimbusML trainers and transforms support the following data structures for the ``fit()`` and ``transform()`` methods:
 
 * ``numpy.ndarray`` 
 * ``scipy.sparse_cst``
 * ``pandas.DataFrame``.
    
-In addition, ``nimbusml`` also supports streaming from files without loading the dataset
+In addition, NimbusML also supports streaming from files without loading the dataset
 into memory, which allows training on data significantly 
 exceeding memory using [``FileDataStream``](docs-ref-autogen/nimbusml.FileDataStream.yml).
 
-With [``FileDataStream``](docs-ref-autogen/nimbusml.FileDataStream.yml), ``nimbusml`` is able to handle
+With [``FileDataStream``](docs-ref-autogen/nimbusml.FileDataStream.yml), NimbusML is able to handle
 up to **billion** features and **billions** of training examples for select algorithms.
 
 
-``nimbusml`` can be easily used for the following problems:
+NimbusML can be easily used for the following problems:
 
 .. image:: _static/images/examples1.png
       :target: tutorials/1-3.md
diff --git a/src/python/docs/sphinx/installationguide.rst b/src/python/docs/sphinx/installationguide.rst
index 5fc1023c..0fd2ea9d 100644
--- a/src/python/docs/sphinx/installationguide.rst
+++ b/src/python/docs/sphinx/installationguide.rst
@@ -26,7 +26,7 @@ The library requires the following dependencies, which will be installed automat
 Installation 
 -------------
 
-``nimbusml`` can be installed using ``pip``:
+NimbusML can be installed using ``pip``:
 
 .. code-block:: console
 
@@ -41,10 +41,10 @@ For a quick test, please run:
 Building
 --------------------
 
-The ``nimbusml`` package can also be built from the `source repo <https://github.com/Microsoft/ML.NET-for-Python>`_
-on Github. For more details about building and testing, please refer to our `GitHub repo <https://github.com/Microsoft/ML.NET-for-Python>`_
+The NimbusML package can also be built from the `source repo <https://github.com/Microsoft/NimbusML>`_
+on Github. For more details about building and testing, please refer to our `GitHub repo <https://github.com/Microsoft/NimbusML>`_
 
 Contributing
 ------------
 
-This is an open source package and we welcome contributions. The source code for the  ``nimbusml`` package is `available in GitHub <https://github.com/Microsoft/ML.NET-for-Python>`_.
+This is an open source package and we welcome contributions. The source code for the  NimbusML package is `available in GitHub <https://github.com/Microsoft/NimbusML>`_.
diff --git a/src/python/docs/sphinx/metrics.rst b/src/python/docs/sphinx/metrics.rst
index 44a6559f..a7fdb94a 100644
--- a/src/python/docs/sphinx/metrics.rst
+++ b/src/python/docs/sphinx/metrics.rst
@@ -57,7 +57,7 @@ This corresponds to evaltype='binary'.
     The computed AUC is defined as the probability that the score
     for a positive example is higher than the score for a negative one
     (see `AucAggregator.cs <https://github.com/dotnet/machinelearning/blob/master/src/Microsoft.ML.Data/Evaluators/AucAggregator.cs#L135>`_
-    in `ML.net <https://www.microsoft.com/net/learn/apps/machine-learning-and-ai/ml-dotnet>`_).
+    in `ML.NET <https://www.microsoft.com/net/learn/apps/machine-learning-and-ai/ml-dotnet>`_).
     This expression is asymptotically equivalent to the area under the curve
     which is what
     `scikit-learn <http://scikit-learn.org/stable/modules/generated/sklearn.metrics.auc.html>`_ computation.
diff --git a/src/python/docs/sphinx/overview.rst b/src/python/docs/sphinx/overview.rst
index 60a32d91..9a1c4171 100644
--- a/src/python/docs/sphinx/overview.rst
+++ b/src/python/docs/sphinx/overview.rst
@@ -2,7 +2,7 @@
 Overview 
 ========
 
-``nimbusml`` provides state-of-the-art ML algorithms, transforms and components,
+NimbusML provides state-of-the-art ML algorithms, transforms and components,
 aiming to make them useful for all developers, data scientists, and information
 workers and helpful in all products, services and devices. The components are
 authored by the team members, as well as numerous contributors from MSR, CISL,
diff --git a/src/python/docs/sphinx/toc.yml b/src/python/docs/sphinx/toc.yml
index 2cbdc1a1..7edbf211 100644
--- a/src/python/docs/sphinx/toc.yml
+++ b/src/python/docs/sphinx/toc.yml
@@ -8,31 +8,31 @@
   - expanded: false
     href: tutorials.md#quick-start
     items:
-    - href: tutorials/quickstart-nimbusml-python.md
+    - href: tutorials/A_A-Classification-with-Synthetic-Data.md
       name: Classification
-    - href: tutorials/quickstart-nimbusml-python-regression.md
+    - href: tutorials/A_C-Regression-with-Synthetic-Data.md
       name: Regression
-    - href: tutorials/sentimental-analysis-twitter.md
+    - href: tutorials/A_B-Twitter-Sentiment-1.md
       name: Sentiment Analysis (Using Pandas)   
     name: Quick Start
   - expanded: false
     href: tutorials.md#important-concept
     items:
-    - href: tutorials/sentimental-analysis-twitter-loading.md
+    - href: tutorials/B_A-Fast-Data-Loading-with-Schema-Twitter-Sentiment-2.md
       name: Streaming Data Loading
-    - href: tutorials/nimbusml-python-column-selection.md
+    - href: tutorials/B_B-Syntax-for-Column-Selection-Classification-Using-Flight-Schedule-Data.md
       name: Column Selection
-    - href: tutorials/image-clustering.md
+    - href: tutorials/B_C-Image-Processing-Clustering.md
       name: Image Processing
-    - href: tutorials/wikipedia-detox-analysis.md
+    - href: tutorials/B_D-Working-with-Scikit-Learn-Toolkit-Classification-Using-Wikipedia-Detox-Data.md
       name: Sentiment Analysis
-    - href: tutorials/defining-column-roles.md
+    - href: tutorials/B_E-Learning-to-Rank-with-Microsoft-Bing-Data.md
       name: Subset Ranking Estimation
     name: Important Concepts
   - expanded: false
     href: tutorials.md#more-examples
     items:
-    - href: tutorials/pipeline-visualization.md
+    - href: tutorials/C_A-Visualize-a-pipeline.md
       name: Pipeline Visualization
     - href: loadsavemodels.md
       name: Loading and Saving Models
diff --git a/src/python/nimbusml/examples/Sentiment.py b/src/python/nimbusml/examples/Sentiment.py
index 171960eb..d7de049a 100644
--- a/src/python/nimbusml/examples/Sentiment.py
+++ b/src/python/nimbusml/examples/Sentiment.py
@@ -19,7 +19,7 @@
 # No need to fit any real data, just a dummy call to fit() to ensure the
 # column name 'review' is present when transform() is invoked
 
-# Skip until ML.Net resolve the resouce issue with Sentiment transform
+# Skip until ML.NET resolve the resouce issue with Sentiment transform
 # y = analyze.fit_transform(customer_reviews)
 
 # View the sentiment scores!!
diff --git a/src/python/nimbusml/examples/examples_from_dataframe/WordEmbedding_df.py b/src/python/nimbusml/examples/examples_from_dataframe/WordEmbedding_df.py
index abc06385..320eaa6d 100644
--- a/src/python/nimbusml/examples/examples_from_dataframe/WordEmbedding_df.py
+++ b/src/python/nimbusml/examples/examples_from_dataframe/WordEmbedding_df.py
@@ -3,7 +3,7 @@
 import pandas
 from nimbusml import Pipeline
 from nimbusml.feature_extraction.text import WordEmbedding
-from nimbusml.feature_extraction.text import NGramFeaturizer
+from nimbusml.feature_extraction.text.ngramfeaturizer import NGramFeaturizer
 from nimbusml.feature_extraction.text.extractor import Ngram
 
 # create the data
diff --git a/src/python/nimbusml/tests/feature_extraction/text/test_sentiment.py b/src/python/nimbusml/tests/feature_extraction/text/test_sentiment.py
index 02095746..3b56296b 100644
--- a/src/python/nimbusml/tests/feature_extraction/text/test_sentiment.py
+++ b/src/python/nimbusml/tests/feature_extraction/text/test_sentiment.py
@@ -19,7 +19,7 @@ class TestSentiment(unittest.TestCase):
 
     @unittest.skip(
         "BUG: Error: *** System.InvalidOperationException: 'resourcePath', "
-        "issue with ML.Net")
+        "issue with ML.NET")
     def test_sentiment(self):
         # Bug 142794
         data = pd.DataFrame({"Sentiment": [0,
diff --git a/src/python/nimbusml/tests/linear_model/test_symsgdbinaryclassifier.py b/src/python/nimbusml/tests/linear_model/test_symsgdbinaryclassifier.py
index 1d065544..2d96a517 100644
--- a/src/python/nimbusml/tests/linear_model/test_symsgdbinaryclassifier.py
+++ b/src/python/nimbusml/tests/linear_model/test_symsgdbinaryclassifier.py
@@ -15,7 +15,7 @@
 
 class TestSymSgdBinaryClassifier(unittest.TestCase):
 
-    @unittest.skip("BUG: Not included in Ml.net yet")
+    @unittest.skip("BUG: Not included in ML.NET yet")
     def test_SymSgdBinaryClassifier(self):
         np.random.seed(0)
         df = get_dataset("infert").as_df()
diff --git a/src/python/nimbusml/tests/metrics/test_metrics.py b/src/python/nimbusml/tests/metrics/test_metrics.py
index ee4d8393..274e1ebb 100644
--- a/src/python/nimbusml/tests/metrics/test_metrics.py
+++ b/src/python/nimbusml/tests/metrics/test_metrics.py
@@ -216,7 +216,7 @@ def test_metrics_evaluate_clusterer(self):
             err_msg="AvgMinScore  should be %s" %
                     0.014)
 
-    @unittest.skip('ML.Net does not have svm')
+    @unittest.skip('ML.NET does not have svm')
     def test_metrics_evaluate_anomalydetection(self):
         np.random.seed(0)
         df = get_dataset("iris").as_df().drop(['Label', 'Species'], axis=1)
@@ -441,9 +441,9 @@ def test_metrics_evaluate_binary_sklearn(self):
         aucsksc = auc(recall, precision)
         print(aucnimbusml, aucskpr, aucsksc)
         assert aucskpr == aucsksc
-        # MLNET: 0.980114
+        # ML.NET: 0.980114
         # SKL: 0.9667731012859688
-        # MLNET computes the AUC as the probability that the score
+        # ML.NET computes the AUC as the probability that the score
         # for a positive example is higher than the score for a negative
         # example.
         # https://github.com/dotnet/machinelearning/blob/master/src/
diff --git a/src/python/nimbusml/tests/pipeline/test_score_method.py b/src/python/nimbusml/tests/pipeline/test_score_method.py
index bdea8be8..37ce45b4 100644
--- a/src/python/nimbusml/tests/pipeline/test_score_method.py
+++ b/src/python/nimbusml/tests/pipeline/test_score_method.py
@@ -102,7 +102,7 @@ def test_score_clusterer(self):
             err_msg="NMI loss should be %s" %
                     0.36840763005544264)
 
-    @unittest.skip("BUG: Not included in Ml.net yet")
+    @unittest.skip("BUG: Not included in ML.NET yet")
     def test_score_anomalydetection(self):
         np.random.seed(0)
         df = get_dataset("iris").as_df().drop(['Label', 'Species'], axis=1)
diff --git a/src/python/nimbusml/tests/utils/test_exports.py b/src/python/nimbusml/tests/utils/test_exports.py
index e83de8dc..3dcaf7e3 100644
--- a/src/python/nimbusml/tests/utils/test_exports.py
+++ b/src/python/nimbusml/tests/utils/test_exports.py
@@ -449,7 +449,7 @@ def test_get_fit_info_clustering(self):
         assert out == ['PredictedLabel', 'Score.0', 'Score.1', 'Score.2']
         assert len(scores) == 9
 
-    @unittest.skip('ML.Net does not have svm')
+    @unittest.skip('ML.NET does not have svm')
     def test_get_fit_info_anomaly(self):
         df = get_dataset("iris").as_df()
         df.drop(['Label', 'Setosa', 'Species'], axis=1, inplace=True)
diff --git a/src/python/setup.py b/src/python/setup.py
index 5f127ec2..7270fcdc 100644
--- a/src/python/setup.py
+++ b/src/python/setup.py
@@ -51,7 +51,7 @@
 
     # Author details
     author='Microsoft',
-    author_email='pytlc@microsoft.com',
+    author_email='nimbusml@microsoft.com',
 
     # Choose your license
     license='All rights reserved',
diff --git a/src/python/setup.py.in b/src/python/setup.py.in
index f006da84..5262e5c1 100644
--- a/src/python/setup.py.in
+++ b/src/python/setup.py.in
@@ -51,7 +51,7 @@ setup(
 
     # Author details
     author='Microsoft',
-    author_email='pytlc@microsoft.com',
+    author_email='nimbusml@microsoft.com',
 
     # Choose your license
     license='All rights reserved',
diff --git a/src/python/tools/update_nimbusml_version.py b/src/python/tools/update_nimbusml_version.py
index 1ba7f2b6..fad789c9 100644
--- a/src/python/tools/update_nimbusml_version.py
+++ b/src/python/tools/update_nimbusml_version.py
@@ -9,7 +9,7 @@
 
 # run this file to update the ML.NET version in all the necessary files:
 #   * double click it in File Explorer, or
-#   * run it directly on Command Prompt, e.g., !python update_mlnet_version.py
+#   * run it directly on Command Prompt, e.g., !python update_nimbusml_version.py
 # see the bottom section of this file for details about this updating process.
 
 import os