From 2422a988e5f23010a5f45ee04a7ffb451cf01d72 Mon Sep 17 00:00:00 2001
From: spalger <spalger@users.noreply.github.com>
Date: Wed, 24 Feb 2016 12:14:05 -0800
Subject: [PATCH 01/12] [rename] rename all files to snake_case
---
src/cli/cli.js | 2 +-
src/cli/cluster/cluster_manager.js | 2 +-
src/cli/cluster/worker.js | 2 +-
src/cli/{Command.js => command.js} | 0
src/cli/index.js | 2 +-
src/cli/{Log.js => log.js} | 0
src/cli/plugin/plugin_installer.js | 2 +-
...ptions.build.js => babel_options.build.js} | 0
.../{babelOptions.js => babel_options.js} | 0
.../{BaseOptimizer.js => base_optimizer.js} | 4 ++--
.../{FsOptimizer.js => fs_optimizer.js} | 4 ++--
src/optimize/index.js | 2 +-
src/optimize/lazy/lazy.js | 4 ++--
.../{LazyOptimizer.js => lazy_optimizer.js} | 4 ++--
.../lazy/{LazyServer.js => lazy_server.js} | 0
.../lazy/{optmzrRole.js => optmzr_role.js} | 4 ++--
.../lazy/{proxyRole.js => proxy_role.js} | 0
...rdControlFlow.js => weird_control_flow.js} | 0
src/plugins/{devMode => dev_mode}/index.js | 0
.../{devMode => dev_mode}/package.json | 0
.../ngMock.js => dev_mode/public/ng_mock.js} | 0
.../public/vis_debug_spy_panel.html} | 0
.../public/vis_debug_spy_panel.js} | 2 +-
.../__tests__/{findPort.js => find_port.js} | 0
.../kbn_vislib_vis_types/public/area.js | 4 ++--
.../kbn_vislib_vis_types/public/histogram.js | 4 ++--
.../public/kbn_vislib_vis_types.js | 2 +-
.../kbn_vislib_vis_types/public/line.js | 4 ++--
.../kbn_vislib_vis_types/public/pie.js | 4 ++--
.../public/{tileMap.js => tile_map.js} | 4 ++--
.../public/dashboard/directives/grid.js | 2 +-
src/plugins/kibana/public/dashboard/index.js | 2 +-
.../public/discover/controllers/discover.js | 8 ++++----
src/plugins/kibana/public/settings/index.js | 2 +-
.../kibana/public/visualize/editor/agg_add.js | 2 +-
.../public/visualize/editor/agg_params.js | 2 +-
.../kibana/public/visualize/editor/editor.js | 2 +-
.../saved_visualizations/_saved_vis.js | 2 +-
.../markdown_vis/public/markdown_vis.js | 2 +-
src/plugins/metric_vis/public/metric_vis.js | 4 ++--
src/plugins/{spyModes => spy_modes}/index.js | 0
.../{spyModes => spy_modes}/package.json | 0
.../public/req_resp_stats_spy_mode.html} | 0
.../public/req_resp_stats_spy_mode.js} | 2 +-
.../public/table_spy_mode.html} | 0
.../public/table_spy_mode.js} | 2 +-
.../{statusPage => status_page}/index.js | 0
.../{statusPage => status_page}/package.json | 0
.../public/lib/format_number.js} | 0
.../public/lib/make_chart_options.js} | 2 +-
.../public/lib/read_stat_data.js} | 0
.../public/lib/to_title_case.js} | 0
.../public/status_page.html} | 0
.../public/status_page.js} | 6 +++---
.../public/status_page.less} | 0
.../public/status_page_metric.html} | 0
.../public/status_page_metric.js} | 8 ++++----
.../table_vis/public/__tests__/_table_vis.js | 2 +-
.../public/__tests__/_table_vis_controller.js | 2 +-
src/plugins/table_vis/public/table_vis.js | 4 ++--
.../find_source_files.js} | 2 +-
.../{testsBundle => tests_bundle}/index.js | 4 ++--
.../package.json | 0
.../tests_entry_template.js} | 4 ++--
.../__tests__/{basePath.js => base_path.js} | 0
...hBuffers.js => deep_clone_with_buffers.js} | 2 +-
.../__tests__/{explodeBy.js => explode_by.js} | 2 +-
.../{flattenWith.js => flatten_with.js} | 2 +-
src/server/config/config.js | 2 +-
...hBuffers.js => deep_clone_with_buffers.js} | 0
.../config/{explodeBy.js => explode_by.js} | 0
.../{flattenWith.js => flatten_with.js} | 0
src/server/config/override.js | 4 ++--
...etDefaultRoute.js => get_default_route.js} | 0
src/server/http/index.js | 2 +-
src/server/{KbnServer.js => kbn_server.js} | 0
...rExtensions.js => commander_extensions.js} | 0
...tersToKeys.js => apply_filters_to_keys.js} | 2 +-
...tersToKeys.js => apply_filters_to_keys.js} | 0
src/server/logging/index.js | 2 +-
.../logging/{LogFormat.js => log_format.js} | 2 +-
.../{LogFormatJson.js => log_format_json.js} | 2 +-
src/server/logging/log_format_string.js | 2 +-
.../{LogReporter.js => log_reporter.js} | 2 +-
src/server/plugins/{Plugin.js => plugin.js} | 0
.../plugins/{PluginApi.js => plugin_api.js} | 2 +-
...uginCollection.js => plugin_collection.js} | 2 +-
src/server/plugins/scan.js | 2 +-
.../{ServerStatus.js => server_status.js} | 4 ++--
.../status/__tests__/{Status.js => status.js} | 4 ++--
src/server/status/index.js | 2 +-
src/server/status/metrics.js | 2 +-
src/server/status/{Samples.js => samples.js} | 0
.../{ServerStatus.js => server_status.js} | 2 +-
src/server/status/{Status.js => status.js} | 0
.../no_digest_promises.js} | 0
.../simulate_keys.js} | 0
.../stub_index_pattern.js | 2 +-
src/ui/index.js | 2 +-
src/ui/public/Vis/__tests__/index.js | 6 ------
.../geo_json/__tests__/geo_json.js | 2 +-
.../public/agg_response/geo_json/geo_json.js | 2 +-
...{rowsToFeatures.js => rows_to_features.js} | 2 +-
.../__tests__/build_hierarchical_data.js | 4 ++--
.../hierarchical/__tests__/create_raw_data.js | 4 ++--
.../hierarchical/_transform_aggregation.js | 2 +-
.../hierarchical/build_hierarchical_data.js | 2 +-
.../point_series/__tests__/_fake_x_aspect.js | 6 +++---
.../point_series/__tests__/_get_aspects.js | 4 ++--
.../point_series/__tests__/_main.js | 4 ++--
.../point_series/_fake_x_aspect.js | 4 ++--
.../tabify/__tests__/_get_columns.js | 2 +-
.../tabify/__tests__/_integration.js | 2 +-
.../tabify/__tests__/_response_writer.js | 2 +-
.../agg_response/tabify/_get_columns.js | 2 +-
.../agg_response/tabify/_response_writer.js | 2 +-
src/ui/public/agg_response/tabify/tabify.js | 2 +-
src/ui/public/agg_table/__tests__/_group.js | 2 +-
src/ui/public/agg_table/__tests__/_table.js | 2 +-
...{AggParamWriter.js => agg_param_writer.js} | 2 +-
.../__tests__/{AggParams.js => agg_params.js} | 2 +-
.../__tests__/{AggType.js => agg_type.js} | 8 ++++----
...ountBetween.js => bucket_count_between.js} | 4 ++--
.../agg_types/__tests__/buckets/_histogram.js | 2 +-
.../agg_types/__tests__/buckets/_range.js | 2 +-
.../buckets/create_filter/date_histogram.js | 2 +-
.../buckets/create_filter/date_range.js | 4 ++--
.../buckets/create_filter/filters.js | 4 ++--
.../buckets/create_filter/histogram.js | 4 ++--
.../buckets/create_filter/ip_range.js | 4 ++--
.../__tests__/buckets/create_filter/range.js | 4 ++--
.../__tests__/buckets/create_filter/terms.js | 4 ++--
.../buckets/date_histogram/_editor.js | 2 +-
.../buckets/date_histogram/_params.js | 4 ++--
src/ui/public/agg_types/__tests__/index.js | 8 ++++----
.../param_types/_calculate_interval.js | 4 ++--
.../agg_types/__tests__/param_types/_regex.js | 2 +-
.../agg_types/{AggParams.js => agg_params.js} | 2 +-
.../agg_types/{AggType.js => agg_type.js} | 2 +-
.../agg_types/buckets/_bucket_agg_type.js | 2 +-
.../buckets/create_filter/ip_range.js | 2 +-
.../agg_types/buckets/date_histogram.js | 2 +-
src/ui/public/agg_types/buckets/histogram.js | 2 +-
src/ui/public/agg_types/buckets/range.js | 4 ++--
.../buckets/{RangeKey.js => range_key.js} | 0
src/ui/public/agg_types/buckets/terms.js | 4 ++--
src/ui/public/agg_types/index.js | 6 +++---
src/ui/public/agg_types/metrics/avg.js | 2 +-
.../public/agg_types/metrics/cardinality.js | 2 +-
src/ui/public/agg_types/metrics/count.js | 2 +-
...ss.js => get_response_agg_config_class.js} | 0
src/ui/public/agg_types/metrics/max.js | 2 +-
src/ui/public/agg_types/metrics/median.js | 4 ++--
.../{MetricAggType.js => metric_agg_type.js} | 2 +-
src/ui/public/agg_types/metrics/min.js | 2 +-
.../agg_types/metrics/percentile_ranks.js | 4 ++--
.../public/agg_types/metrics/percentiles.js | 4 ++--
.../{stdDeviation.js => std_deviation.js} | 4 ++--
src/ui/public/agg_types/metrics/sum.js | 2 +-
.../public/agg_types/param_types/optioned.js | 2 +-
src/ui/public/autoload/modules.js | 4 ++--
.../Binder.js => binder/__tests__/binder.js} | 2 +-
.../{Binder/Binder.js => binder/binder.js} | 0
.../{_TabFakeStore.js => _tab_fake_store.js} | 0
.../chrome/__tests__/{Tab.js => tab.js} | 4 ++--
.../{TabCollection.js => tab_collection.js} | 6 +++---
src/ui/public/chrome/api/__tests__/apps.js | 2 +-
src/ui/public/chrome/api/tabs.js | 2 +-
src/ui/public/chrome/context.js | 2 +-
.../app_switcher/__tests__/app_switcher.js | 2 +-
.../directives/app_switcher/app_switcher.js | 2 +-
src/ui/public/chrome/directives/kbn_chrome.js | 2 +-
src/ui/public/chrome/{Tab.js => tab.js} | 0
.../{TabCollection.js => tab_collection.js} | 2 +-
.../{ConfigTemplate.js => config_template.js} | 0
.../{requestQueue.js => request_queue.js} | 0
.../__tests__/{DocSource.js => doc_source.js} | 0
.../{SearchSource.js => search_source.js} | 0
.../{fixedScroll.js => fixed_scroll.js} | 2 +-
src/ui/public/directives/config.js | 2 +-
src/ui/public/directives/kbnSrc.js | 3 ---
.../directives/{kbnHref.js => kbn_href.js} | 0
src/ui/public/directives/kbn_src.js | 3 +++
src/ui/public/directives/pretty_duration.js | 2 +-
src/ui/public/directives/rows.js | 2 +-
.../public/directives/validate_cidr_mask.js | 2 +-
.../public/directives/validate_date_math.js | 2 +-
src/ui/public/directives/validate_ip.js | 2 +-
.../{domLocation.js => dom_location.js} | 0
src/ui/public/events.js | 2 +-
.../public/factories/__tests__/base_object.js | 2 +-
src/ui/public/fancy_forms/fancy_forms.js | 2 +-
...rmController.js => kbn_form_controller.js} | 0
.../{_addFilters.js => _add_filters.js} | 0
.../{_getFilters.js => _get_filters.js} | 0
.../{_invertFilters.js => _invert_filters.js} | 0
.../{_pinFilters.js => _pin_filters.js} | 0
.../{_removeFilters.js => _remove_filters.js} | 0
.../{_toggleFilters.js => _toggle_filters.js} | 0
.../{_updateFilters.js => _update_filters.js} | 0
.../public/filter_bar/__tests__/filter_bar.js | 2 +-
.../filter_bar/__tests__/query_filter.js | 14 ++++++-------
src/ui/public/filter_bar/filter_bar.js | 12 +++++------
.../filter_bar/filter_bar_click_handler.js | 4 ++--
...ngeTimeFilter.js => change_time_filter.js} | 2 +-
.../{dedupFilters.js => dedup_filters.js} | 2 +-
...ctTimeFilter.js => extract_time_filter.js} | 2 +-
...Unwrap.js => filter_applied_and_unwrap.js} | 2 +-
...ter.js => filter_out_time_based_filter.js} | 2 +-
...pingChain.js => generate_mapping_chain.js} | 2 +-
...nFilters.js => map_and_flatten_filters.js} | 2 +-
.../{mapDefault.js => map_default.js} | 2 +-
.../__tests__/{mapExists.js => map_exists.js} | 2 +-
.../__tests__/{mapFilter.js => map_filter.js} | 2 +-
...ers.js => map_flatten_and_wrap_filters.js} | 2 +-
...BoundingBox.js => map_geo_bounding_box.js} | 2 +-
.../{mapMatchAll.js => map_match_all.js} | 2 +-
.../{mapMissing.js => map_missing.js} | 2 +-
...{mapQueryString.js => map_query_string.js} | 2 +-
.../__tests__/{mapRange.js => map_range.js} | 2 +-
.../__tests__/{mapScript.js => map_script.js} | 2 +-
.../__tests__/{mapTerms.js => map_terms.js} | 2 +-
.../{onlyDisabled.js => only_disabled.js} | 2 +-
.../{uniqFilters.js => uniq_filters.js} | 2 +-
...ngeTimeFilter.js => change_time_filter.js} | 0
.../{compareFilters.js => compare_filters.js} | 0
.../lib/{dedupFilters.js => dedup_filters.js} | 2 +-
...ctTimeFilter.js => extract_time_filter.js} | 0
...Unwrap.js => filter_applied_and_unwrap.js} | 0
...ter.js => filter_out_time_based_filter.js} | 0
...pingChain.js => generate_mapping_chain.js} | 0
...nFilters.js => map_and_flatten_filters.js} | 2 +-
.../lib/{mapDefault.js => map_default.js} | 0
.../lib/{mapExists.js => map_exists.js} | 0
.../lib/{mapFilter.js => map_filter.js} | 20 +++++++++----------
...ers.js => map_flatten_and_wrap_filters.js} | 2 +-
...BoundingBox.js => map_geo_bounding_box.js} | 0
.../lib/{mapMatchAll.js => map_match_all.js} | 0
.../lib/{mapMissing.js => map_missing.js} | 0
...{mapQueryString.js => map_query_string.js} | 0
.../lib/{mapRange.js => map_range.js} | 0
.../lib/{mapScript.js => map_script.js} | 0
.../lib/{mapTerms.js => map_terms.js} | 0
.../lib/{onlyDisabled.js => only_disabled.js} | 0
...yStateChanged.js => only_state_changed.js} | 2 +-
.../lib/{remapFilters.js => remap_filters.js} | 0
.../lib/{uniqFilters.js => uniq_filters.js} | 2 +-
src/ui/public/filter_bar/query_filter.js | 10 +++++-----
.../__tests__/{commaList.js => comma_list.js} | 2 +-
.../filters/{commaList.js => comma_list.js} | 0
.../{fixedScroll.js => fixed_scroll.js} | 0
.../{_FieldFormat.js => _field_format.js} | 2 +-
.../__tests__/_index_pattern.js | 2 +-
.../public/index_patterns/__tests__/index.js | 2 +-
.../index_patterns/_cast_mapping_type.js | 2 +-
src/ui/public/index_patterns/_field.js | 4 ++--
.../{contentTypes.js => content_types.js} | 0
.../{FieldFormat.js => field_format.js} | 2 +-
src/ui/public/index_patterns/_field_list.js | 2 +-
src/ui/public/index_patterns/_field_types.js | 2 +-
src/ui/public/index_patterns/_intervals.js | 2 +-
.../load_default.js} | 0
.../__tests__/indexed_array.js} | 2 +-
.../__tests__/inflector.js | 2 +-
.../indexed_array.js} | 2 +-
.../inflector.js | 0
...indTestSubject.js => find_test_subject.js} | 0
...indTestSubject.js => find_test_subject.js} | 0
.../{Notifier_lib.js => notifier_lib.js} | 0
.../public/persisted_state/persisted_state.js | 2 +-
src/ui/public/registry/_registry.js | 2 +-
.../{_RouteManager.js => _route_manager.js} | 2 +-
.../{_WorkQueue.js => _work_queue.js} | 2 +-
...teWithPrep.js => _wrap_route_with_prep.js} | 4 ++--
src/ui/public/routes/__tests__/index.js | 6 +++---
.../{RouteManager.js => route_manager.js} | 4 ++--
...SetupManager.js => route_setup_manager.js} | 0
src/ui/public/routes/routes.js | 2 +-
.../routes/{WorkQueue.js => work_queue.js} | 0
...uteWithPrep.js => wrap_route_with_prep.js} | 2 +-
.../set_error_stack.js} | 0
.../source_map_reader.js} | 0
.../stack_line_format.js} | 0
.../stack_trace_mapper.js} | 8 ++++----
.../translate_stack_line.js} | 0
.../stringify/__tests__/_conformance.js | 2 +-
src/ui/public/stringify/register.js | 18 ++++++++---------
.../types/{_Numeral.js => _numeral.js} | 2 +-
.../stringify/types/{Bytes.js => bytes.js} | 2 +-
.../stringify/types/{Color.js => color.js} | 2 +-
.../stringify/types/{Date.js => date.js} | 2 +-
.../public/stringify/types/{Ip.js => ip.js} | 2 +-
.../stringify/types/{Number.js => number.js} | 2 +-
.../types/{Percent.js => percent.js} | 2 +-
.../stringify/types/{Source.js => source.js} | 2 +-
.../stringify/types/{String.js => string.js} | 2 +-
src/ui/public/stringify/types/truncate.js | 2 +-
.../public/stringify/types/{Url.js => url.js} | 2 +-
.../__tests__/style_compile.js} | 0
.../style_compile.css.tmpl} | 0
.../style_compile.js} | 2 +-
...lateRenderbot.js => template_renderbot.js} | 2 +-
...emplateVisType.js => template_vis_type.js} | 4 ++--
.../test_harness.js} | 4 ++--
.../test_harness.less} | 0
.../public/time_buckets/calc_es_interval.js | 2 +-
src/ui/public/time_buckets/time_buckets.js | 2 +-
src/ui/public/timefilter/timefilter.js | 2 +-
src/ui/public/timepicker/timepicker.js | 2 +-
src/ui/public/utils/__tests__/cidr_mask.js | 2 +-
src/ui/public/utils/__tests__/datemath.js | 2 +-
.../{Ipv4Address.js => ipv4Address.js} | 2 +-
.../__tests__/{ObjDefine.js => obj_define.js} | 2 +-
.../{SimpleEmitter.js => simple_emitter.js} | 2 +-
.../utils/{BaseObject.js => base_object.js} | 0
.../utils/{CidrMask.js => cidr_mask.js} | 2 +-
.../utils/{dateMath.js => date_math.js} | 0
src/ui/public/utils/{esBool.js => es_bool.js} | 0
.../utils/{Ipv4Address.js => ipv4Address.js} | 0
.../utils/{ObjDefine.js => obj_define.js} | 0
src/ui/public/utils/parse_interval.js | 2 +-
.../{SimpleEmitter.js => simple_emitter.js} | 2 +-
...eInterval.js => validate_date_interval.js} | 0
.../__tests__/_agg_config.js} | 6 +++---
.../__tests__/_agg_config_result.js} | 6 +++---
.../__tests__/_agg_configs.js} | 12 +++++------
.../__tests__/_renderbot.js} | 2 +-
.../_Vis.js => vis/__tests__/_vis.js} | 2 +-
src/ui/public/vis/__tests__/index.js | 6 ++++++
.../{Vis/AggConfig.js => vis/agg_config.js} | 0
.../agg_config_result.js} | 0
.../{Vis/AggConfigs.js => vis/agg_configs.js} | 4 ++--
.../{Vis/Renderbot.js => vis/renderbot.js} | 0
.../public/{Vis/Schemas.js => vis/schemas.js} | 4 ++--
src/ui/public/{Vis/Vis.js => vis/vis.js} | 2 +-
.../{Vis/VisType.js => vis/vis_type.js} | 2 +-
.../public/vislib/__tests__/lib/dispatch.js | 2 +-
.../__tests__/visualizations/pie_chart.js | 2 +-
.../__tests__/positioning.js | 2 +-
.../position_tooltip.js} | 0
.../Tooltip.js => tooltip/tooltip.js} | 4 ++--
src/ui/public/vislib/lib/alerts.js | 2 +-
src/ui/public/vislib/lib/chart_title.js | 2 +-
src/ui/public/vislib/lib/dispatch.js | 4 ++--
src/ui/public/vislib/lib/handler/handler.js | 2 +-
src/ui/public/vislib/vis.js | 2 +-
src/ui/public/vislib/visualizations/_chart.js | 2 +-
.../visualizations/_point_series_chart.js | 2 +-
.../vislib/visualizations/time_marker.js | 2 +-
...buildChartData.js => _build_chart_data.js} | 2 +-
...islibRenderbot.js => _vislib_renderbot.js} | 4 ++--
.../public/vislib_vis_type/__tests__/index.js | 4 ++--
...{buildChartData.js => build_chart_data.js} | 0
...VislibRenderbot.js => vislib_renderbot.js} | 4 ++--
.../{VislibVisType.js => vislib_vis_type.js} | 6 +++---
src/ui/ui_bundler_env.js | 2 +-
.../{rootRedirect.jade => root_redirect.jade} | 0
src/utils/{Collection.js => collection.js} | 0
src/utils/{fromRoot.js => from_root.js} | 2 +-
src/utils/{packageJson.js => package_json.js} | 0
.../{pathContains.js => path_contains.js} | 0
.../{babelOptions.js => babel_options.js} | 0
...dNodeBuilds.js => download_node_builds.js} | 0
tasks/build/{getProps.js => get_props.js} | 0
...{installNpmDeps.js => install_npm_deps.js} | 0
...stalledPlugins.js => installed_plugins.js} | 0
tasks/build/{osPackages.js => os_packages.js} | 0
.../build/{packageJson.js => package_json.js} | 0
...PkgJsonDeps.js => remove_pkg_json_deps.js} | 0
.../{versionedLinks.js => versioned_links.js} | 0
...wnloadSelenium.js => download_selenium.js} | 0
...wnloadSelenium.js => download_selenium.js} | 0
.../{updateVersion.js => update_version.js} | 0
test/{apiIntern.js => api_intern.js} | 0
.../{emptyKibana => empty_kibana}/kibana.js | 0
.../kibana_definition.js} | 0
.../logstash-2015.09.20.js | 0
.../logstash-2015.09.21.js | 0
.../logstash-2015.09.22.js | 0
.../makelogs_index_definition.js} | 0
...nition.js => makelogs_index_definition.js} | 0
test/mocha_setup.js | 2 +-
test/{serverConfig.js => server_config.js} | 0
.../__tests__/{getPage.js => get_page.js} | 2 +-
test/utils/{getUrl.js => get_url.js} | 0
385 files changed, 382 insertions(+), 382 deletions(-)
rename src/cli/{Command.js => command.js} (100%)
rename src/cli/{Log.js => log.js} (100%)
rename src/optimize/{babelOptions.build.js => babel_options.build.js} (100%)
rename src/optimize/{babelOptions.js => babel_options.js} (100%)
rename src/optimize/{BaseOptimizer.js => base_optimizer.js} (98%)
rename src/optimize/{FsOptimizer.js => fs_optimizer.js} (86%)
rename src/optimize/lazy/{LazyOptimizer.js => lazy_optimizer.js} (96%)
rename src/optimize/lazy/{LazyServer.js => lazy_server.js} (100%)
rename src/optimize/lazy/{optmzrRole.js => optmzr_role.js} (92%)
rename src/optimize/lazy/{proxyRole.js => proxy_role.js} (100%)
rename src/optimize/lazy/{WeirdControlFlow.js => weird_control_flow.js} (100%)
rename src/plugins/{devMode => dev_mode}/index.js (100%)
rename src/plugins/{devMode => dev_mode}/package.json (100%)
rename src/plugins/{devMode/public/ngMock.js => dev_mode/public/ng_mock.js} (100%)
rename src/plugins/{devMode/public/visDebugSpyPanel.html => dev_mode/public/vis_debug_spy_panel.html} (100%)
rename src/plugins/{devMode/public/visDebugSpyPanel.js => dev_mode/public/vis_debug_spy_panel.js} (85%)
rename src/plugins/elasticsearch/lib/__tests__/{findPort.js => find_port.js} (100%)
rename src/plugins/kbn_vislib_vis_types/public/{tileMap.js => tile_map.js} (98%)
rename src/plugins/{spyModes => spy_modes}/index.js (100%)
rename src/plugins/{spyModes => spy_modes}/package.json (100%)
rename src/plugins/{spyModes/public/reqRespStatsSpyMode.html => spy_modes/public/req_resp_stats_spy_mode.html} (100%)
rename src/plugins/{spyModes/public/reqRespStatsSpyMode.js => spy_modes/public/req_resp_stats_spy_mode.js} (94%)
rename src/plugins/{spyModes/public/tableSpyMode.html => spy_modes/public/table_spy_mode.html} (100%)
rename src/plugins/{spyModes/public/tableSpyMode.js => spy_modes/public/table_spy_mode.js} (93%)
rename src/plugins/{statusPage => status_page}/index.js (100%)
rename src/plugins/{statusPage => status_page}/package.json (100%)
rename src/plugins/{statusPage/public/lib/formatNumber.js => status_page/public/lib/format_number.js} (100%)
rename src/plugins/{statusPage/public/lib/makeChartOptions.js => status_page/public/lib/make_chart_options.js} (93%)
rename src/plugins/{statusPage/public/lib/readStatData.js => status_page/public/lib/read_stat_data.js} (100%)
rename src/plugins/{statusPage/public/lib/toTitleCase.js => status_page/public/lib/to_title_case.js} (100%)
rename src/plugins/{statusPage/public/statusPage.html => status_page/public/status_page.html} (100%)
rename src/plugins/{statusPage/public/statusPage.js => status_page/public/status_page.js} (88%)
rename src/plugins/{statusPage/public/statusPage.less => status_page/public/status_page.less} (100%)
rename src/plugins/{statusPage/public/statusPageMetric.html => status_page/public/status_page_metric.html} (100%)
rename src/plugins/{statusPage/public/statusPageMetric.js => status_page/public/status_page_metric.js} (88%)
rename src/plugins/{testsBundle/findSourceFiles.js => tests_bundle/find_source_files.js} (95%)
rename src/plugins/{testsBundle => tests_bundle}/index.js (93%)
rename src/plugins/{testsBundle => tests_bundle}/package.json (100%)
rename src/plugins/{testsBundle/testsEntryTemplate.js => tests_bundle/tests_entry_template.js} (88%)
rename src/server/__tests__/{basePath.js => base_path.js} (100%)
rename src/server/config/__tests__/{deepCloneWithBuffers.js => deep_clone_with_buffers.js} (96%)
rename src/server/config/__tests__/{explodeBy.js => explode_by.js} (94%)
rename src/server/config/__tests__/{flattenWith.js => flatten_with.js} (93%)
rename src/server/config/{deepCloneWithBuffers.js => deep_clone_with_buffers.js} (100%)
rename src/server/config/{explodeBy.js => explode_by.js} (100%)
rename src/server/config/{flattenWith.js => flatten_with.js} (100%)
rename src/server/http/{getDefaultRoute.js => get_default_route.js} (100%)
rename src/server/{KbnServer.js => kbn_server.js} (100%)
rename src/server/lib/{commanderExtensions.js => commander_extensions.js} (100%)
rename src/server/logging/__tests__/{applyFiltersToKeys.js => apply_filters_to_keys.js} (92%)
rename src/server/logging/{applyFiltersToKeys.js => apply_filters_to_keys.js} (100%)
rename src/server/logging/{LogFormat.js => log_format.js} (98%)
rename src/server/logging/{LogFormatJson.js => log_format_json.js} (88%)
rename src/server/logging/{LogReporter.js => log_reporter.js} (94%)
rename src/server/plugins/{Plugin.js => plugin.js} (100%)
rename src/server/plugins/{PluginApi.js => plugin_api.js} (96%)
rename src/server/plugins/{PluginCollection.js => plugin_collection.js} (96%)
rename src/server/status/__tests__/{ServerStatus.js => server_status.js} (97%)
rename src/server/status/__tests__/{Status.js => status.js} (97%)
rename src/server/status/{Samples.js => samples.js} (100%)
rename src/server/status/{ServerStatus.js => server_status.js} (97%)
rename src/server/status/{Status.js => status.js} (100%)
rename src/{testUtils/noDigestPromises.js => test_utils/no_digest_promises.js} (100%)
rename src/{testUtils/simulateKeys.js => test_utils/simulate_keys.js} (100%)
rename src/{testUtils => test_utils}/stub_index_pattern.js (97%)
delete mode 100644 src/ui/public/Vis/__tests__/index.js
rename src/ui/public/agg_response/geo_json/{rowsToFeatures.js => rows_to_features.js} (96%)
rename src/ui/public/agg_types/__tests__/{AggParamWriter.js => agg_param_writer.js} (99%)
rename src/ui/public/agg_types/__tests__/{AggParams.js => agg_params.js} (98%)
rename src/ui/public/agg_types/__tests__/{AggType.js => agg_type.js} (96%)
rename src/ui/public/agg_types/__tests__/{bucketCountBetween.js => bucket_count_between.js} (98%)
rename src/ui/public/agg_types/{AggParams.js => agg_params.js} (98%)
rename src/ui/public/agg_types/{AggType.js => agg_type.js} (98%)
rename src/ui/public/agg_types/buckets/{RangeKey.js => range_key.js} (100%)
rename src/ui/public/agg_types/metrics/{getResponseAggConfigClass.js => get_response_agg_config_class.js} (100%)
rename src/ui/public/agg_types/metrics/{MetricAggType.js => metric_agg_type.js} (96%)
rename src/ui/public/agg_types/metrics/{stdDeviation.js => std_deviation.js} (95%)
rename src/ui/public/{Binder/__tests__/Binder.js => binder/__tests__/binder.js} (98%)
rename src/ui/public/{Binder/Binder.js => binder/binder.js} (100%)
rename src/ui/public/chrome/__tests__/{_TabFakeStore.js => _tab_fake_store.js} (100%)
rename src/ui/public/chrome/__tests__/{Tab.js => tab.js} (99%)
rename src/ui/public/chrome/__tests__/{TabCollection.js => tab_collection.js} (94%)
rename src/ui/public/chrome/{Tab.js => tab.js} (100%)
rename src/ui/public/chrome/{TabCollection.js => tab_collection.js} (97%)
rename src/ui/public/{ConfigTemplate.js => config_template.js} (100%)
rename src/ui/public/courier/__tests__/{requestQueue.js => request_queue.js} (100%)
rename src/ui/public/courier/data_source/__tests__/{DocSource.js => doc_source.js} (100%)
rename src/ui/public/courier/data_source/__tests__/{SearchSource.js => search_source.js} (100%)
rename src/ui/public/directives/__tests__/{fixedScroll.js => fixed_scroll.js} (99%)
delete mode 100644 src/ui/public/directives/kbnSrc.js
rename src/ui/public/directives/{kbnHref.js => kbn_href.js} (100%)
create mode 100644 src/ui/public/directives/kbn_src.js
rename src/ui/public/{domLocation.js => dom_location.js} (100%)
rename src/ui/public/fancy_forms/{KbnFormController.js => kbn_form_controller.js} (100%)
rename src/ui/public/filter_bar/__tests__/{_addFilters.js => _add_filters.js} (100%)
rename src/ui/public/filter_bar/__tests__/{_getFilters.js => _get_filters.js} (100%)
rename src/ui/public/filter_bar/__tests__/{_invertFilters.js => _invert_filters.js} (100%)
rename src/ui/public/filter_bar/__tests__/{_pinFilters.js => _pin_filters.js} (100%)
rename src/ui/public/filter_bar/__tests__/{_removeFilters.js => _remove_filters.js} (100%)
rename src/ui/public/filter_bar/__tests__/{_toggleFilters.js => _toggle_filters.js} (100%)
rename src/ui/public/filter_bar/__tests__/{_updateFilters.js => _update_filters.js} (100%)
rename src/ui/public/filter_bar/lib/__tests__/{changeTimeFilter.js => change_time_filter.js} (98%)
rename src/ui/public/filter_bar/lib/__tests__/{dedupFilters.js => dedup_filters.js} (96%)
rename src/ui/public/filter_bar/lib/__tests__/{extractTimeFilter.js => extract_time_filter.js} (98%)
rename src/ui/public/filter_bar/lib/__tests__/{filterAppliedAndUnwrap.js => filter_applied_and_unwrap.js} (86%)
rename src/ui/public/filter_bar/lib/__tests__/{filterOutTimeBasedFilter.js => filter_out_time_based_filter.js} (96%)
rename src/ui/public/filter_bar/lib/__tests__/{generateMappingChain.js => generate_mapping_chain.js} (99%)
rename src/ui/public/filter_bar/lib/__tests__/{mapAndFlattenFilters.js => map_and_flatten_filters.js} (98%)
rename src/ui/public/filter_bar/lib/__tests__/{mapDefault.js => map_default.js} (99%)
rename src/ui/public/filter_bar/lib/__tests__/{mapExists.js => map_exists.js} (99%)
rename src/ui/public/filter_bar/lib/__tests__/{mapFilter.js => map_filter.js} (99%)
rename src/ui/public/filter_bar/lib/__tests__/{mapFlattenAndWrapFilters.js => map_flatten_and_wrap_filters.js} (97%)
rename src/ui/public/filter_bar/lib/__tests__/{mapGeoBoundingBox.js => map_geo_bounding_box.js} (98%)
rename src/ui/public/filter_bar/lib/__tests__/{mapMatchAll.js => map_match_all.js} (98%)
rename src/ui/public/filter_bar/lib/__tests__/{mapMissing.js => map_missing.js} (98%)
rename src/ui/public/filter_bar/lib/__tests__/{mapQueryString.js => map_query_string.js} (98%)
rename src/ui/public/filter_bar/lib/__tests__/{mapRange.js => map_range.js} (96%)
rename src/ui/public/filter_bar/lib/__tests__/{mapScript.js => map_script.js} (99%)
rename src/ui/public/filter_bar/lib/__tests__/{mapTerms.js => map_terms.js} (94%)
rename src/ui/public/filter_bar/lib/__tests__/{onlyDisabled.js => only_disabled.js} (98%)
rename src/ui/public/filter_bar/lib/__tests__/{uniqFilters.js => uniq_filters.js} (95%)
rename src/ui/public/filter_bar/lib/{changeTimeFilter.js => change_time_filter.js} (100%)
rename src/ui/public/filter_bar/lib/{compareFilters.js => compare_filters.js} (100%)
rename src/ui/public/filter_bar/lib/{dedupFilters.js => dedup_filters.js} (91%)
rename src/ui/public/filter_bar/lib/{extractTimeFilter.js => extract_time_filter.js} (100%)
rename src/ui/public/filter_bar/lib/{filterAppliedAndUnwrap.js => filter_applied_and_unwrap.js} (100%)
rename src/ui/public/filter_bar/lib/{filterOutTimeBasedFilter.js => filter_out_time_based_filter.js} (100%)
rename src/ui/public/filter_bar/lib/{generateMappingChain.js => generate_mapping_chain.js} (100%)
rename src/ui/public/filter_bar/lib/{mapAndFlattenFilters.js => map_and_flatten_filters.js} (97%)
rename src/ui/public/filter_bar/lib/{mapDefault.js => map_default.js} (100%)
rename src/ui/public/filter_bar/lib/{mapExists.js => map_exists.js} (100%)
rename src/ui/public/filter_bar/lib/{mapFilter.js => map_filter.js} (81%)
rename src/ui/public/filter_bar/lib/{mapFlattenAndWrapFilters.js => map_flatten_and_wrap_filters.js} (93%)
rename src/ui/public/filter_bar/lib/{mapGeoBoundingBox.js => map_geo_bounding_box.js} (100%)
rename src/ui/public/filter_bar/lib/{mapMatchAll.js => map_match_all.js} (100%)
rename src/ui/public/filter_bar/lib/{mapMissing.js => map_missing.js} (100%)
rename src/ui/public/filter_bar/lib/{mapQueryString.js => map_query_string.js} (100%)
rename src/ui/public/filter_bar/lib/{mapRange.js => map_range.js} (100%)
rename src/ui/public/filter_bar/lib/{mapScript.js => map_script.js} (100%)
rename src/ui/public/filter_bar/lib/{mapTerms.js => map_terms.js} (100%)
rename src/ui/public/filter_bar/lib/{onlyDisabled.js => only_disabled.js} (100%)
rename src/ui/public/filter_bar/lib/{onlyStateChanged.js => only_state_changed.js} (87%)
rename src/ui/public/filter_bar/lib/{remapFilters.js => remap_filters.js} (100%)
rename src/ui/public/filter_bar/lib/{uniqFilters.js => uniq_filters.js} (88%)
rename src/ui/public/filters/__tests__/{commaList.js => comma_list.js} (96%)
rename src/ui/public/filters/{commaList.js => comma_list.js} (100%)
rename src/ui/public/{fixedScroll.js => fixed_scroll.js} (100%)
rename src/ui/public/index_patterns/__tests__/{_FieldFormat.js => _field_format.js} (99%)
rename src/ui/public/index_patterns/_field_format/{contentTypes.js => content_types.js} (100%)
rename src/ui/public/index_patterns/_field_format/{FieldFormat.js => field_format.js} (98%)
rename src/ui/public/index_patterns/{routeSetup/loadDefault.js => route_setup/load_default.js} (100%)
rename src/ui/public/{IndexedArray/__tests__/IndexedArray.js => indexed_array/__tests__/indexed_array.js} (98%)
rename src/ui/public/{IndexedArray => indexed_array}/__tests__/inflector.js (96%)
rename src/ui/public/{IndexedArray/IndexedArray.js => indexed_array/indexed_array.js} (98%)
rename src/ui/public/{IndexedArray => indexed_array}/inflector.js (100%)
rename src/ui/public/jquery/__tests__/{findTestSubject.js => find_test_subject.js} (100%)
rename src/ui/public/jquery/{findTestSubject.js => find_test_subject.js} (100%)
rename src/ui/public/notify/__tests__/{Notifier_lib.js => notifier_lib.js} (100%)
rename src/ui/public/routes/__tests__/{_RouteManager.js => _route_manager.js} (98%)
rename src/ui/public/routes/__tests__/{_WorkQueue.js => _work_queue.js} (98%)
rename src/ui/public/routes/__tests__/{_wrapRouteWithPrep.js => _wrap_route_with_prep.js} (95%)
rename src/ui/public/routes/{RouteManager.js => route_manager.js} (93%)
rename src/ui/public/routes/{RouteSetupManager.js => route_setup_manager.js} (100%)
rename src/ui/public/routes/{WorkQueue.js => work_queue.js} (100%)
rename src/ui/public/routes/{wrapRouteWithPrep.js => wrap_route_with_prep.js} (95%)
rename src/ui/public/{StackTraceMapper/setErrorStack.js => stack_trace_mapper/set_error_stack.js} (100%)
rename src/ui/public/{StackTraceMapper/SourceMapReader.js => stack_trace_mapper/source_map_reader.js} (100%)
rename src/ui/public/{StackTraceMapper/stackLineFormat.js => stack_trace_mapper/stack_line_format.js} (100%)
rename src/ui/public/{StackTraceMapper/StackTraceMapper.js => stack_trace_mapper/stack_trace_mapper.js} (88%)
rename src/ui/public/{StackTraceMapper/translateStackLine.js => stack_trace_mapper/translate_stack_line.js} (100%)
rename src/ui/public/stringify/types/{_Numeral.js => _numeral.js} (97%)
rename src/ui/public/stringify/types/{Bytes.js => bytes.js} (78%)
rename src/ui/public/stringify/types/{Color.js => color.js} (97%)
rename src/ui/public/stringify/types/{Date.js => date.js} (97%)
rename src/ui/public/stringify/types/{Ip.js => ip.js} (93%)
rename src/ui/public/stringify/types/{Number.js => number.js} (80%)
rename src/ui/public/stringify/types/{Percent.js => percent.js} (91%)
rename src/ui/public/stringify/types/{Source.js => source.js} (97%)
rename src/ui/public/stringify/types/{String.js => string.js} (97%)
rename src/ui/public/stringify/types/{Url.js => url.js} (98%)
rename src/ui/public/{styleCompile/__tests__/styleCompile.js => style_compile/__tests__/style_compile.js} (100%)
rename src/ui/public/{styleCompile/styleCompile.css.tmpl => style_compile/style_compile.css.tmpl} (100%)
rename src/ui/public/{styleCompile/styleCompile.js => style_compile/style_compile.js} (92%)
rename src/ui/public/template_vis_type/{TemplateRenderbot.js => template_renderbot.js} (92%)
rename src/ui/public/template_vis_type/{TemplateVisType.js => template_vis_type.js} (89%)
rename src/ui/public/{testHarness/testHarness.js => test_harness/test_harness.js} (95%)
rename src/ui/public/{testHarness/testHarness.less => test_harness/test_harness.less} (100%)
rename src/ui/public/utils/__tests__/{Ipv4Address.js => ipv4Address.js} (97%)
rename src/ui/public/utils/__tests__/{ObjDefine.js => obj_define.js} (98%)
rename src/ui/public/utils/__tests__/{SimpleEmitter.js => simple_emitter.js} (98%)
rename src/ui/public/utils/{BaseObject.js => base_object.js} (100%)
rename src/ui/public/utils/{CidrMask.js => cidr_mask.js} (95%)
rename src/ui/public/utils/{dateMath.js => date_math.js} (100%)
rename src/ui/public/utils/{esBool.js => es_bool.js} (100%)
rename src/ui/public/utils/{Ipv4Address.js => ipv4Address.js} (100%)
rename src/ui/public/utils/{ObjDefine.js => obj_define.js} (100%)
rename src/ui/public/utils/{SimpleEmitter.js => simple_emitter.js} (98%)
rename src/ui/public/{validateDateInterval.js => validate_date_interval.js} (100%)
rename src/ui/public/{Vis/__tests__/_AggConfig.js => vis/__tests__/_agg_config.js} (98%)
rename src/ui/public/{Vis/__tests__/_AggConfigResult.js => vis/__tests__/_agg_config_result.js} (96%)
rename src/ui/public/{Vis/__tests__/_AggConfigs.js => vis/__tests__/_agg_configs.js} (97%)
rename src/ui/public/{Vis/__tests__/_Renderbot.js => vis/__tests__/_renderbot.js} (94%)
rename src/ui/public/{Vis/__tests__/_Vis.js => vis/__tests__/_vis.js} (99%)
create mode 100644 src/ui/public/vis/__tests__/index.js
rename src/ui/public/{Vis/AggConfig.js => vis/agg_config.js} (100%)
rename src/ui/public/{Vis/AggConfigResult.js => vis/agg_config_result.js} (100%)
rename src/ui/public/{Vis/AggConfigs.js => vis/agg_configs.js} (97%)
rename src/ui/public/{Vis/Renderbot.js => vis/renderbot.js} (100%)
rename src/ui/public/{Vis/Schemas.js => vis/schemas.js} (93%)
rename src/ui/public/{Vis/Vis.js => vis/vis.js} (98%)
rename src/ui/public/{Vis/VisType.js => vis/vis_type.js} (92%)
rename src/ui/public/vislib/components/{Tooltip => tooltip}/__tests__/positioning.js (99%)
rename src/ui/public/vislib/components/{Tooltip/positionTooltip.js => tooltip/position_tooltip.js} (100%)
rename src/ui/public/vislib/components/{Tooltip/Tooltip.js => tooltip/tooltip.js} (98%)
rename src/ui/public/vislib_vis_type/__tests__/{_buildChartData.js => _build_chart_data.js} (99%)
rename src/ui/public/vislib_vis_type/__tests__/{_VislibRenderbot.js => _vislib_renderbot.js} (98%)
rename src/ui/public/vislib_vis_type/{buildChartData.js => build_chart_data.js} (100%)
rename src/ui/public/vislib_vis_type/{VislibRenderbot.js => vislib_renderbot.js} (96%)
rename src/ui/public/vislib_vis_type/{VislibVisType.js => vislib_vis_type.js} (90%)
rename src/ui/views/{rootRedirect.jade => root_redirect.jade} (100%)
rename src/utils/{Collection.js => collection.js} (100%)
rename src/utils/{fromRoot.js => from_root.js} (71%)
rename src/utils/{packageJson.js => package_json.js} (100%)
rename src/utils/{pathContains.js => path_contains.js} (100%)
rename tasks/build/{babelOptions.js => babel_options.js} (100%)
rename tasks/build/{downloadNodeBuilds.js => download_node_builds.js} (100%)
rename tasks/build/{getProps.js => get_props.js} (100%)
rename tasks/build/{installNpmDeps.js => install_npm_deps.js} (100%)
rename tasks/build/{installedPlugins.js => installed_plugins.js} (100%)
rename tasks/build/{osPackages.js => os_packages.js} (100%)
rename tasks/build/{packageJson.js => package_json.js} (100%)
rename tasks/build/{removePkgJsonDeps.js => remove_pkg_json_deps.js} (100%)
rename tasks/build/{versionedLinks.js => versioned_links.js} (100%)
rename tasks/config/{downloadSelenium.js => download_selenium.js} (100%)
rename tasks/{downloadSelenium.js => download_selenium.js} (100%)
rename tasks/utils/{updateVersion.js => update_version.js} (100%)
rename test/{apiIntern.js => api_intern.js} (100%)
rename test/fixtures/scenarios/{emptyKibana => empty_kibana}/kibana.js (100%)
rename test/fixtures/scenarios/{emptyKibana/kibanaDefinition.js => empty_kibana/kibana_definition.js} (100%)
rename test/fixtures/scenarios/{logstashFunctional => logstash_functional}/logstash-2015.09.20.js (100%)
rename test/fixtures/scenarios/{logstashFunctional => logstash_functional}/logstash-2015.09.21.js (100%)
rename test/fixtures/scenarios/{logstashFunctional => logstash_functional}/logstash-2015.09.22.js (100%)
rename test/fixtures/scenarios/{logstashFunctional/makelogsIndexDefinition.js => logstash_functional/makelogs_index_definition.js} (100%)
rename test/fixtures/scenarios/makelogs/{makelogsIndexDefinition.js => makelogs_index_definition.js} (100%)
rename test/{serverConfig.js => server_config.js} (100%)
rename test/utils/__tests__/{getPage.js => get_page.js} (95%)
rename test/utils/{getUrl.js => get_url.js} (100%)
diff --git a/src/cli/cli.js b/src/cli/cli.js
index edc838706919d..7b115c799ca4f 100644
--- a/src/cli/cli.js
+++ b/src/cli/cli.js
@@ -2,7 +2,7 @@ import _ from 'lodash';
let utils = require('requirefrom')('src/utils');
let pkg = utils('packageJson');
-import Command from './Command';
+import Command from './command';
let argv = process.env.kbnWorkerArgv ? JSON.parse(process.env.kbnWorkerArgv) : process.argv.slice();
let program = new Command('bin/kibana');
diff --git a/src/cli/cluster/cluster_manager.js b/src/cli/cluster/cluster_manager.js
index dce3184ba61af..02101fa0d73c6 100644
--- a/src/cli/cluster/cluster_manager.js
+++ b/src/cli/cluster/cluster_manager.js
@@ -4,7 +4,7 @@ const { format: formatUrl } = require('url');
import Hapi from 'hapi';
const { debounce, compact, get, invoke, bindAll, once, sample } = require('lodash');
-import Log from '../Log';
+import Log from '../log';
import Worker from './worker';
import BasePathProxy from './base_path_proxy';
diff --git a/src/cli/cluster/worker.js b/src/cli/cluster/worker.js
index c8bbcada4579d..cc0c823c5090d 100644
--- a/src/cli/cluster/worker.js
+++ b/src/cli/cluster/worker.js
@@ -3,7 +3,7 @@ import cluster from 'cluster';
let { resolve } = require('path');
let { EventEmitter } = require('events');
-import fromRoot from '../../utils/fromRoot';
+import fromRoot from '../../utils/from_root';
let cliPath = fromRoot('src/cli');
let baseArgs = _.difference(process.argv.slice(2), ['--no-watch']);
diff --git a/src/cli/Command.js b/src/cli/command.js
similarity index 100%
rename from src/cli/Command.js
rename to src/cli/command.js
diff --git a/src/cli/index.js b/src/cli/index.js
index e7f562b571154..a0cd17d62f151 100644
--- a/src/cli/index.js
+++ b/src/cli/index.js
@@ -1,5 +1,5 @@
// load the babel options seperately so that they can modify the process.env
// before calling babel/register
-const babelOptions = require('../optimize/babelOptions').node;
+const babelOptions = require('../optimize/babel_options').node;
require('babel/register')(babelOptions);
require('./cli');
diff --git a/src/cli/Log.js b/src/cli/log.js
similarity index 100%
rename from src/cli/Log.js
rename to src/cli/log.js
diff --git a/src/cli/plugin/plugin_installer.js b/src/cli/plugin/plugin_installer.js
index 23010bf6ef493..275d673849bd8 100644
--- a/src/cli/plugin/plugin_installer.js
+++ b/src/cli/plugin/plugin_installer.js
@@ -4,7 +4,7 @@ const fromRoot = utils('fromRoot');
import pluginDownloader from './plugin_downloader';
import pluginCleaner from './plugin_cleaner';
import pluginExtractor from './plugin_extractor';
-import KbnServer from '../../server/KbnServer';
+import KbnServer from '../../server/kbn_server';
import readYamlConfig from '../serve/read_yaml_config';
import Promise from 'bluebird';
import { sync as rimrafSync } from 'rimraf';
diff --git a/src/optimize/babelOptions.build.js b/src/optimize/babel_options.build.js
similarity index 100%
rename from src/optimize/babelOptions.build.js
rename to src/optimize/babel_options.build.js
diff --git a/src/optimize/babelOptions.js b/src/optimize/babel_options.js
similarity index 100%
rename from src/optimize/babelOptions.js
rename to src/optimize/babel_options.js
diff --git a/src/optimize/BaseOptimizer.js b/src/optimize/base_optimizer.js
similarity index 98%
rename from src/optimize/BaseOptimizer.js
rename to src/optimize/base_optimizer.js
index 19a0c2fedd4b3..9498962623272 100644
--- a/src/optimize/BaseOptimizer.js
+++ b/src/optimize/base_optimizer.js
@@ -4,8 +4,8 @@ import DirectoryNameAsMain from 'webpack-directory-name-as-main';
import ExtractTextPlugin from 'extract-text-webpack-plugin';
import CommonsChunkPlugin from 'webpack/lib/optimize/CommonsChunkPlugin';
-import fromRoot from '../utils/fromRoot';
-import babelOptions from './babelOptions';
+import fromRoot from '../utils/from_root';
+import babelOptions from './babel_options';
import { inherits } from 'util';
import { defaults, transform } from 'lodash';
import { resolve } from 'path';
diff --git a/src/optimize/FsOptimizer.js b/src/optimize/fs_optimizer.js
similarity index 86%
rename from src/optimize/FsOptimizer.js
rename to src/optimize/fs_optimizer.js
index 178385838b8b4..67e03c66c64a8 100644
--- a/src/optimize/FsOptimizer.js
+++ b/src/optimize/fs_optimizer.js
@@ -1,6 +1,6 @@
-import BaseOptimizer from './BaseOptimizer';
-import fromRoot from '../utils/fromRoot';
+import BaseOptimizer from './base_optimizer';
+import fromRoot from '../utils/from_root';
import { fromNode } from 'bluebird';
import { writeFile } from 'fs';
diff --git a/src/optimize/index.js b/src/optimize/index.js
index fd7d4ac5a6423..9131f8fe278f7 100644
--- a/src/optimize/index.js
+++ b/src/optimize/index.js
@@ -1,4 +1,4 @@
-import FsOptimizer from './FsOptimizer';
+import FsOptimizer from './fs_optimizer';
module.exports = async (kbnServer, server, config) => {
if (!config.get('optimize.enabled')) return;
diff --git a/src/optimize/lazy/lazy.js b/src/optimize/lazy/lazy.js
index 9a32eb00913a6..c370f88c16de1 100644
--- a/src/optimize/lazy/lazy.js
+++ b/src/optimize/lazy/lazy.js
@@ -21,11 +21,11 @@ module.exports = async (kbnServer, server, config) => {
*/
switch (process.env.kbnWorkerType) {
case 'optmzr':
- await kbnServer.mixin(require('./optmzrRole'));
+ await kbnServer.mixin(require('./optmzr_role'));
break;
case 'server':
- await kbnServer.mixin(require('./proxyRole'));
+ await kbnServer.mixin(require('./proxy_role'));
break;
default:
diff --git a/src/optimize/lazy/LazyOptimizer.js b/src/optimize/lazy/lazy_optimizer.js
similarity index 96%
rename from src/optimize/lazy/LazyOptimizer.js
rename to src/optimize/lazy/lazy_optimizer.js
index a4ead1974f528..ca7b052e392f6 100644
--- a/src/optimize/lazy/LazyOptimizer.js
+++ b/src/optimize/lazy/lazy_optimizer.js
@@ -1,7 +1,7 @@
import Boom from 'boom';
-import BaseOptimizer from '../BaseOptimizer';
-import WeirdControlFlow from './WeirdControlFlow';
+import BaseOptimizer from '../base_optimizer';
+import WeirdControlFlow from './weird_control_flow';
import { once, pick, size } from 'lodash';
import { join } from 'path';
diff --git a/src/optimize/lazy/LazyServer.js b/src/optimize/lazy/lazy_server.js
similarity index 100%
rename from src/optimize/lazy/LazyServer.js
rename to src/optimize/lazy/lazy_server.js
diff --git a/src/optimize/lazy/optmzrRole.js b/src/optimize/lazy/optmzr_role.js
similarity index 92%
rename from src/optimize/lazy/optmzrRole.js
rename to src/optimize/lazy/optmzr_role.js
index 51bdcc6ae9705..72ead01df6f4e 100644
--- a/src/optimize/lazy/optmzrRole.js
+++ b/src/optimize/lazy/optmzr_role.js
@@ -1,5 +1,5 @@
-import LazyServer from './LazyServer';
-import LazyOptimizer from './LazyOptimizer';
+import LazyServer from './lazy_server';
+import LazyOptimizer from './lazy_optimizer';
module.exports = async (kbnServer, kibanaHapiServer, config) => {
let src = require('requirefrom')('src');
diff --git a/src/optimize/lazy/proxyRole.js b/src/optimize/lazy/proxy_role.js
similarity index 100%
rename from src/optimize/lazy/proxyRole.js
rename to src/optimize/lazy/proxy_role.js
diff --git a/src/optimize/lazy/WeirdControlFlow.js b/src/optimize/lazy/weird_control_flow.js
similarity index 100%
rename from src/optimize/lazy/WeirdControlFlow.js
rename to src/optimize/lazy/weird_control_flow.js
diff --git a/src/plugins/devMode/index.js b/src/plugins/dev_mode/index.js
similarity index 100%
rename from src/plugins/devMode/index.js
rename to src/plugins/dev_mode/index.js
diff --git a/src/plugins/devMode/package.json b/src/plugins/dev_mode/package.json
similarity index 100%
rename from src/plugins/devMode/package.json
rename to src/plugins/dev_mode/package.json
diff --git a/src/plugins/devMode/public/ngMock.js b/src/plugins/dev_mode/public/ng_mock.js
similarity index 100%
rename from src/plugins/devMode/public/ngMock.js
rename to src/plugins/dev_mode/public/ng_mock.js
diff --git a/src/plugins/devMode/public/visDebugSpyPanel.html b/src/plugins/dev_mode/public/vis_debug_spy_panel.html
similarity index 100%
rename from src/plugins/devMode/public/visDebugSpyPanel.html
rename to src/plugins/dev_mode/public/vis_debug_spy_panel.html
diff --git a/src/plugins/devMode/public/visDebugSpyPanel.js b/src/plugins/dev_mode/public/vis_debug_spy_panel.js
similarity index 85%
rename from src/plugins/devMode/public/visDebugSpyPanel.js
rename to src/plugins/dev_mode/public/vis_debug_spy_panel.js
index a9b0ba154bd30..d691a806de038 100644
--- a/src/plugins/devMode/public/visDebugSpyPanel.js
+++ b/src/plugins/dev_mode/public/vis_debug_spy_panel.js
@@ -1,4 +1,4 @@
-import visDebugSpyPanelTemplate from 'plugins/devMode/visDebugSpyPanel.html';
+import visDebugSpyPanelTemplate from 'plugins/dev_mode/vis_debug_spy_panel.html';
// register the spy mode or it won't show up in the spys
require('ui/registry/spy_modes').register(VisDetailsSpyProvider);
diff --git a/src/plugins/elasticsearch/lib/__tests__/findPort.js b/src/plugins/elasticsearch/lib/__tests__/find_port.js
similarity index 100%
rename from src/plugins/elasticsearch/lib/__tests__/findPort.js
rename to src/plugins/elasticsearch/lib/__tests__/find_port.js
diff --git a/src/plugins/kbn_vislib_vis_types/public/area.js b/src/plugins/kbn_vislib_vis_types/public/area.js
index 8f7df38820e99..f4e99beed3b2c 100644
--- a/src/plugins/kbn_vislib_vis_types/public/area.js
+++ b/src/plugins/kbn_vislib_vis_types/public/area.js
@@ -1,5 +1,5 @@
-import VislibVisTypeVislibVisTypeProvider from 'ui/vislib_vis_type/VislibVisType';
-import VisSchemasProvider from 'ui/Vis/Schemas';
+import VislibVisTypeVislibVisTypeProvider from 'ui/vislib_vis_type/vislib_vis_type';
+import VisSchemasProvider from 'ui/vis/schemas';
import areaTemplate from 'plugins/kbn_vislib_vis_types/editors/area.html';
export default function HistogramVisType(Private) {
diff --git a/src/plugins/kbn_vislib_vis_types/public/histogram.js b/src/plugins/kbn_vislib_vis_types/public/histogram.js
index e0879e41d7823..47ab6adecdf51 100644
--- a/src/plugins/kbn_vislib_vis_types/public/histogram.js
+++ b/src/plugins/kbn_vislib_vis_types/public/histogram.js
@@ -1,5 +1,5 @@
-import VislibVisTypeVislibVisTypeProvider from 'ui/vislib_vis_type/VislibVisType';
-import VisSchemasProvider from 'ui/Vis/Schemas';
+import VislibVisTypeVislibVisTypeProvider from 'ui/vislib_vis_type/vislib_vis_type';
+import VisSchemasProvider from 'ui/vis/schemas';
import histogramTemplate from 'plugins/kbn_vislib_vis_types/editors/histogram.html';
export default function HistogramVisType(Private) {
diff --git a/src/plugins/kbn_vislib_vis_types/public/kbn_vislib_vis_types.js b/src/plugins/kbn_vislib_vis_types/public/kbn_vislib_vis_types.js
index 0f19a3a031b49..38859a7738b47 100644
--- a/src/plugins/kbn_vislib_vis_types/public/kbn_vislib_vis_types.js
+++ b/src/plugins/kbn_vislib_vis_types/public/kbn_vislib_vis_types.js
@@ -3,4 +3,4 @@ visTypes.register(require('plugins/kbn_vislib_vis_types/histogram'));
visTypes.register(require('plugins/kbn_vislib_vis_types/line'));
visTypes.register(require('plugins/kbn_vislib_vis_types/pie'));
visTypes.register(require('plugins/kbn_vislib_vis_types/area'));
-visTypes.register(require('plugins/kbn_vislib_vis_types/tileMap'));
+visTypes.register(require('plugins/kbn_vislib_vis_types/tile_map'));
diff --git a/src/plugins/kbn_vislib_vis_types/public/line.js b/src/plugins/kbn_vislib_vis_types/public/line.js
index 60bd40e36435d..9e113ca04b33d 100644
--- a/src/plugins/kbn_vislib_vis_types/public/line.js
+++ b/src/plugins/kbn_vislib_vis_types/public/line.js
@@ -1,5 +1,5 @@
-import VislibVisTypeVislibVisTypeProvider from 'ui/vislib_vis_type/VislibVisType';
-import VisSchemasProvider from 'ui/Vis/Schemas';
+import VislibVisTypeVislibVisTypeProvider from 'ui/vislib_vis_type/vislib_vis_type';
+import VisSchemasProvider from 'ui/vis/schemas';
import lineTemplate from 'plugins/kbn_vislib_vis_types/editors/line.html';
export default function HistogramVisType(Private) {
diff --git a/src/plugins/kbn_vislib_vis_types/public/pie.js b/src/plugins/kbn_vislib_vis_types/public/pie.js
index f7621a381d263..10d14d4814959 100644
--- a/src/plugins/kbn_vislib_vis_types/public/pie.js
+++ b/src/plugins/kbn_vislib_vis_types/public/pie.js
@@ -1,5 +1,5 @@
-import VislibVisTypeVislibVisTypeProvider from 'ui/vislib_vis_type/VislibVisType';
-import VisSchemasProvider from 'ui/Vis/Schemas';
+import VislibVisTypeVislibVisTypeProvider from 'ui/vislib_vis_type/vislib_vis_type';
+import VisSchemasProvider from 'ui/vis/schemas';
import pieTemplate from 'plugins/kbn_vislib_vis_types/editors/pie.html';
export default function HistogramVisType(Private) {
diff --git a/src/plugins/kbn_vislib_vis_types/public/tileMap.js b/src/plugins/kbn_vislib_vis_types/public/tile_map.js
similarity index 98%
rename from src/plugins/kbn_vislib_vis_types/public/tileMap.js
rename to src/plugins/kbn_vislib_vis_types/public/tile_map.js
index 537bfbd1b8c5f..788b50e832e80 100644
--- a/src/plugins/kbn_vislib_vis_types/public/tileMap.js
+++ b/src/plugins/kbn_vislib_vis_types/public/tile_map.js
@@ -1,7 +1,7 @@
import _ from 'lodash';
import supports from 'ui/utils/supports';
-import VislibVisTypeVislibVisTypeProvider from 'ui/vislib_vis_type/VislibVisType';
-import VisSchemasProvider from 'ui/Vis/Schemas';
+import VislibVisTypeVislibVisTypeProvider from 'ui/vislib_vis_type/vislib_vis_type';
+import VisSchemasProvider from 'ui/vis/schemas';
import AggResponseGeoJsonGeoJsonProvider from 'ui/agg_response/geo_json/geo_json';
import FilterBarPushFilterProvider from 'ui/filter_bar/push_filter';
import tileMapTemplate from 'plugins/kbn_vislib_vis_types/editors/tile_map.html';
diff --git a/src/plugins/kibana/public/dashboard/directives/grid.js b/src/plugins/kibana/public/dashboard/directives/grid.js
index 4c501aeeb2a75..77c0d1aeb4f42 100644
--- a/src/plugins/kibana/public/dashboard/directives/grid.js
+++ b/src/plugins/kibana/public/dashboard/directives/grid.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
import $ from 'jquery';
-import Binder from 'ui/Binder';
+import Binder from 'ui/binder';
import 'gridster';
import uiModules from 'ui/modules';
diff --git a/src/plugins/kibana/public/dashboard/index.js b/src/plugins/kibana/public/dashboard/index.js
index c4813d6499bea..581979cbb4ab5 100644
--- a/src/plugins/kibana/public/dashboard/index.js
+++ b/src/plugins/kibana/public/dashboard/index.js
@@ -1,7 +1,7 @@
import _ from 'lodash';
import $ from 'jquery';
import angular from 'angular';
-import ConfigTemplate from 'ui/ConfigTemplate';
+import ConfigTemplate from 'ui/config_template';
import chrome from 'ui/chrome';
import 'ui/directives/config';
import 'ui/courier';
diff --git a/src/plugins/kibana/public/discover/controllers/discover.js b/src/plugins/kibana/public/discover/controllers/discover.js
index a7b17b5afd22c..26f342034847f 100644
--- a/src/plugins/kibana/public/discover/controllers/discover.js
+++ b/src/plugins/kibana/public/discover/controllers/discover.js
@@ -1,14 +1,14 @@
import _ from 'lodash';
import angular from 'angular';
import moment from 'moment';
-import ConfigTemplate from 'ui/ConfigTemplate';
+import ConfigTemplate from 'ui/config_template';
import getSort from 'ui/doc_table/lib/get_sort';
import rison from 'ui/utils/rison';
-import dateMath from 'ui/utils/dateMath';
+import dateMath from 'ui/utils/date_math';
import 'ui/doc_table';
import 'ui/visualize';
import 'ui/notify';
-import 'ui/fixedScroll';
+import 'ui/fixed_scroll';
import 'ui/directives/validate_json';
import 'ui/filters/moment';
import 'ui/courier';
@@ -17,7 +17,7 @@ import 'ui/state_management/app_state';
import 'ui/timefilter';
import 'ui/highlight/highlight_tags';
import 'ui/share';
-import VisProvider from 'ui/Vis';
+import VisProvider from 'ui/vis';
import DocTitleProvider from 'ui/doc_title';
import UtilsBrushEventProvider from 'ui/utils/brush_event';
import PluginsKibanaDiscoverHitSortFnProvider from 'plugins/kibana/discover/_hit_sort_fn';
diff --git a/src/plugins/kibana/public/settings/index.js b/src/plugins/kibana/public/settings/index.js
index 56037a5848a9d..f1e88929b239c 100644
--- a/src/plugins/kibana/public/settings/index.js
+++ b/src/plugins/kibana/public/settings/index.js
@@ -20,7 +20,7 @@ uiRoutes
redirectTo: '/settings/indices'
});
-require('ui/index_patterns/routeSetup/loadDefault')({
+require('ui/index_patterns/route_setup/load_default')({
notRequiredRe: /^\/settings\//,
whenMissingRedirectTo: '/settings/indices'
});
diff --git a/src/plugins/kibana/public/visualize/editor/agg_add.js b/src/plugins/kibana/public/visualize/editor/agg_add.js
index d0b7ec14953e4..44a3334169bda 100644
--- a/src/plugins/kibana/public/visualize/editor/agg_add.js
+++ b/src/plugins/kibana/public/visualize/editor/agg_add.js
@@ -1,4 +1,4 @@
-import VisAggConfigProvider from 'ui/Vis/AggConfig';
+import VisAggConfigProvider from 'ui/vis/agg_config';
import uiModules from 'ui/modules';
import aggAddTemplate from 'plugins/kibana/visualize/editor/agg_add.html';
diff --git a/src/plugins/kibana/public/visualize/editor/agg_params.js b/src/plugins/kibana/public/visualize/editor/agg_params.js
index 61cf86f848319..a525057c017cd 100644
--- a/src/plugins/kibana/public/visualize/editor/agg_params.js
+++ b/src/plugins/kibana/public/visualize/editor/agg_params.js
@@ -1,4 +1,4 @@
-import IndexedArray from 'ui/IndexedArray';
+import IndexedArray from 'ui/indexed_array';
import _ from 'lodash';
import $ from 'jquery';
import aggSelectHtml from 'plugins/kibana/visualize/editor/agg_select.html';
diff --git a/src/plugins/kibana/public/visualize/editor/editor.js b/src/plugins/kibana/public/visualize/editor/editor.js
index 0428833db4998..7e6784553a88a 100644
--- a/src/plugins/kibana/public/visualize/editor/editor.js
+++ b/src/plugins/kibana/public/visualize/editor/editor.js
@@ -7,7 +7,7 @@ import 'ui/visualize';
import 'ui/collapsible_sidebar';
import 'ui/share';
import angular from 'angular';
-import ConfigTemplate from 'ui/ConfigTemplate';
+import ConfigTemplate from 'ui/config_template';
import Notifier from 'ui/notify/notifier';
import RegistryVisTypesProvider from 'ui/registry/vis_types';
import DocTitleProvider from 'ui/doc_title';
diff --git a/src/plugins/kibana/public/visualize/saved_visualizations/_saved_vis.js b/src/plugins/kibana/public/visualize/saved_visualizations/_saved_vis.js
index dfcecb6199437..20ab2138469b7 100644
--- a/src/plugins/kibana/public/visualize/saved_visualizations/_saved_vis.js
+++ b/src/plugins/kibana/public/visualize/saved_visualizations/_saved_vis.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import VisProvider from 'ui/Vis';
+import VisProvider from 'ui/vis';
import uiModules from 'ui/modules';
uiModules
.get('app/visualize')
diff --git a/src/plugins/markdown_vis/public/markdown_vis.js b/src/plugins/markdown_vis/public/markdown_vis.js
index fb7edc8caf40e..4dd89fad52367 100644
--- a/src/plugins/markdown_vis/public/markdown_vis.js
+++ b/src/plugins/markdown_vis/public/markdown_vis.js
@@ -1,6 +1,6 @@
import 'plugins/markdown_vis/markdown_vis.less';
import 'plugins/markdown_vis/markdown_vis_controller';
-import TemplateVisTypeTemplateVisTypeProvider from 'ui/template_vis_type/TemplateVisType';
+import TemplateVisTypeTemplateVisTypeProvider from 'ui/template_vis_type/template_vis_type';
import markdownVisTemplate from 'plugins/markdown_vis/markdown_vis.html';
import markdownVisParamsTemplate from 'plugins/markdown_vis/markdown_vis_params.html';
// we need to load the css ourselves
diff --git a/src/plugins/metric_vis/public/metric_vis.js b/src/plugins/metric_vis/public/metric_vis.js
index e5427ad965a43..f73b9ffe5a7a9 100644
--- a/src/plugins/metric_vis/public/metric_vis.js
+++ b/src/plugins/metric_vis/public/metric_vis.js
@@ -1,7 +1,7 @@
import 'plugins/metric_vis/metric_vis.less';
import 'plugins/metric_vis/metric_vis_controller';
-import TemplateVisTypeTemplateVisTypeProvider from 'ui/template_vis_type/TemplateVisType';
-import VisSchemasProvider from 'ui/Vis/Schemas';
+import TemplateVisTypeTemplateVisTypeProvider from 'ui/template_vis_type/template_vis_type';
+import VisSchemasProvider from 'ui/vis/schemas';
import metricVisTemplate from 'plugins/metric_vis/metric_vis.html';
import metricVisParamsTemplate from 'plugins/metric_vis/metric_vis_params.html';
// we need to load the css ourselves
diff --git a/src/plugins/spyModes/index.js b/src/plugins/spy_modes/index.js
similarity index 100%
rename from src/plugins/spyModes/index.js
rename to src/plugins/spy_modes/index.js
diff --git a/src/plugins/spyModes/package.json b/src/plugins/spy_modes/package.json
similarity index 100%
rename from src/plugins/spyModes/package.json
rename to src/plugins/spy_modes/package.json
diff --git a/src/plugins/spyModes/public/reqRespStatsSpyMode.html b/src/plugins/spy_modes/public/req_resp_stats_spy_mode.html
similarity index 100%
rename from src/plugins/spyModes/public/reqRespStatsSpyMode.html
rename to src/plugins/spy_modes/public/req_resp_stats_spy_mode.html
diff --git a/src/plugins/spyModes/public/reqRespStatsSpyMode.js b/src/plugins/spy_modes/public/req_resp_stats_spy_mode.js
similarity index 94%
rename from src/plugins/spyModes/public/reqRespStatsSpyMode.js
rename to src/plugins/spy_modes/public/req_resp_stats_spy_mode.js
index 967260c7f2b1b..2084d42a430db 100644
--- a/src/plugins/spyModes/public/reqRespStatsSpyMode.js
+++ b/src/plugins/spy_modes/public/req_resp_stats_spy_mode.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import reqRespStatsHTML from 'plugins/spyModes/reqRespStatsSpyMode.html';
+import reqRespStatsHTML from 'plugins/spy_modes/req_resp_stats_spy_mode.html';
const linkReqRespStats = function ($scope, config) {
$scope.$bind('req', 'searchSource.history[searchSource.history.length - 1]');
diff --git a/src/plugins/spyModes/public/tableSpyMode.html b/src/plugins/spy_modes/public/table_spy_mode.html
similarity index 100%
rename from src/plugins/spyModes/public/tableSpyMode.html
rename to src/plugins/spy_modes/public/table_spy_mode.html
diff --git a/src/plugins/spyModes/public/tableSpyMode.js b/src/plugins/spy_modes/public/table_spy_mode.js
similarity index 93%
rename from src/plugins/spyModes/public/tableSpyMode.js
rename to src/plugins/spy_modes/public/table_spy_mode.js
index 31a78ca895fae..f786614074779 100644
--- a/src/plugins/spyModes/public/tableSpyMode.js
+++ b/src/plugins/spy_modes/public/table_spy_mode.js
@@ -2,7 +2,7 @@ import { saveAs } from '@spalger/filesaver';
import _ from 'lodash';
import 'ui/agg_table';
import AggResponseTabifyTabifyProvider from 'ui/agg_response/tabify/tabify';
-import tableSpyModeTemplate from 'plugins/spyModes/tableSpyMode.html';
+import tableSpyModeTemplate from 'plugins/spy_modes/table_spy_mode.html';
function VisSpyTableProvider(Notifier, $filter, $rootScope, config, Private) {
const tabifyAggResponse = Private(AggResponseTabifyTabifyProvider);
diff --git a/src/plugins/statusPage/index.js b/src/plugins/status_page/index.js
similarity index 100%
rename from src/plugins/statusPage/index.js
rename to src/plugins/status_page/index.js
diff --git a/src/plugins/statusPage/package.json b/src/plugins/status_page/package.json
similarity index 100%
rename from src/plugins/statusPage/package.json
rename to src/plugins/status_page/package.json
diff --git a/src/plugins/statusPage/public/lib/formatNumber.js b/src/plugins/status_page/public/lib/format_number.js
similarity index 100%
rename from src/plugins/statusPage/public/lib/formatNumber.js
rename to src/plugins/status_page/public/lib/format_number.js
diff --git a/src/plugins/statusPage/public/lib/makeChartOptions.js b/src/plugins/status_page/public/lib/make_chart_options.js
similarity index 93%
rename from src/plugins/statusPage/public/lib/makeChartOptions.js
rename to src/plugins/status_page/public/lib/make_chart_options.js
index 085ab4b788d55..e5cf46f2602dd 100644
--- a/src/plugins/statusPage/public/lib/makeChartOptions.js
+++ b/src/plugins/status_page/public/lib/make_chart_options.js
@@ -1,5 +1,5 @@
-import formatNumber from './formatNumber';
+import formatNumber from './format_number';
module.exports = function makeChartOptions(type) {
return {
diff --git a/src/plugins/statusPage/public/lib/readStatData.js b/src/plugins/status_page/public/lib/read_stat_data.js
similarity index 100%
rename from src/plugins/statusPage/public/lib/readStatData.js
rename to src/plugins/status_page/public/lib/read_stat_data.js
diff --git a/src/plugins/statusPage/public/lib/toTitleCase.js b/src/plugins/status_page/public/lib/to_title_case.js
similarity index 100%
rename from src/plugins/statusPage/public/lib/toTitleCase.js
rename to src/plugins/status_page/public/lib/to_title_case.js
diff --git a/src/plugins/statusPage/public/statusPage.html b/src/plugins/status_page/public/status_page.html
similarity index 100%
rename from src/plugins/statusPage/public/statusPage.html
rename to src/plugins/status_page/public/status_page.html
diff --git a/src/plugins/statusPage/public/statusPage.js b/src/plugins/status_page/public/status_page.js
similarity index 88%
rename from src/plugins/statusPage/public/statusPage.js
rename to src/plugins/status_page/public/status_page.js
index b7ce8705fc5c6..8938e33e62bf7 100644
--- a/src/plugins/statusPage/public/statusPage.js
+++ b/src/plugins/status_page/public/status_page.js
@@ -2,8 +2,8 @@ import _ from 'lodash';
import notify from 'ui/notify';
import $ from 'jquery';
import 'ui/autoload/styles';
-import 'plugins/statusPage/statusPageMetric';
-import 'plugins/statusPage/statusPage.less';
+import 'plugins/status_page/status_page_metric';
+import 'plugins/status_page/status_page.less';
const chrome = require('ui/chrome')
@@ -14,7 +14,7 @@ const chrome = require('ui/chrome')
activeIndicatorColor: '#EFF0F2'
}
])
-.setRootTemplate(require('plugins/statusPage/statusPage.html'))
+.setRootTemplate(require('plugins/status_page/status_page.html'))
.setRootController('ui', function ($http, $scope) {
const ui = this;
ui.loading = false;
diff --git a/src/plugins/statusPage/public/statusPage.less b/src/plugins/status_page/public/status_page.less
similarity index 100%
rename from src/plugins/statusPage/public/statusPage.less
rename to src/plugins/status_page/public/status_page.less
diff --git a/src/plugins/statusPage/public/statusPageMetric.html b/src/plugins/status_page/public/status_page_metric.html
similarity index 100%
rename from src/plugins/statusPage/public/statusPageMetric.html
rename to src/plugins/status_page/public/status_page_metric.html
diff --git a/src/plugins/statusPage/public/statusPageMetric.js b/src/plugins/status_page/public/status_page_metric.js
similarity index 88%
rename from src/plugins/statusPage/public/statusPageMetric.js
rename to src/plugins/status_page/public/status_page_metric.js
index 06faa301173cd..1893e8eda2d4b 100644
--- a/src/plugins/statusPage/public/statusPageMetric.js
+++ b/src/plugins/status_page/public/status_page_metric.js
@@ -2,11 +2,11 @@ import _ from 'lodash';
import moment from 'moment';
import numeral from 'numeral';
-import toTitleCase from './lib/toTitleCase';
-import formatNumber from './lib/formatNumber';
-import readStatData from './lib/readStatData';
+import toTitleCase from './lib/to_title_case';
+import formatNumber from './lib/format_number';
+import readStatData from './lib/read_stat_data';
import uiModules from 'ui/modules';
-import statusPageMetricTemplate from 'plugins/statusPage/statusPageMetric.html';
+import statusPageMetricTemplate from 'plugins/status_page/status_page_metric.html';
function calcAvg(metricList, metricNumberType) {
return metricList.map(function (data) {
diff --git a/src/plugins/table_vis/public/__tests__/_table_vis.js b/src/plugins/table_vis/public/__tests__/_table_vis.js
index de4ba73f1d4ad..8d54948f1b672 100644
--- a/src/plugins/table_vis/public/__tests__/_table_vis.js
+++ b/src/plugins/table_vis/public/__tests__/_table_vis.js
@@ -4,7 +4,7 @@ import expect from 'expect.js';
import ngMock from 'ngMock';
import sinon from 'auto-release-sinon';
import AggResponseTabifyTableGroupProvider from 'ui/agg_response/tabify/_table_group';
-import VisProvider from 'ui/Vis';
+import VisProvider from 'ui/vis';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
describe('Integration', function () {
diff --git a/src/plugins/table_vis/public/__tests__/_table_vis_controller.js b/src/plugins/table_vis/public/__tests__/_table_vis_controller.js
index a0bee84cc43a8..ebc00d8fa8558 100644
--- a/src/plugins/table_vis/public/__tests__/_table_vis_controller.js
+++ b/src/plugins/table_vis/public/__tests__/_table_vis_controller.js
@@ -5,7 +5,7 @@ import ngMock from 'ngMock';
import sinon from 'auto-release-sinon';
import tabifyPm from 'ui/agg_response/tabify/tabify';
import AggResponseTabifyTableGroupProvider from 'ui/agg_response/tabify/_table_group';
-import VisProvider from 'ui/Vis';
+import VisProvider from 'ui/vis';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
describe('Controller', function () {
diff --git a/src/plugins/table_vis/public/table_vis.js b/src/plugins/table_vis/public/table_vis.js
index 6ee5b06749619..6fc93174f131b 100644
--- a/src/plugins/table_vis/public/table_vis.js
+++ b/src/plugins/table_vis/public/table_vis.js
@@ -3,8 +3,8 @@ import 'plugins/table_vis/table_vis_controller';
import 'plugins/table_vis/table_vis_params';
import 'ui/agg_table';
import 'ui/agg_table/agg_table_group';
-import TemplateVisTypeTemplateVisTypeProvider from 'ui/template_vis_type/TemplateVisType';
-import VisSchemasProvider from 'ui/Vis/Schemas';
+import TemplateVisTypeTemplateVisTypeProvider from 'ui/template_vis_type/template_vis_type';
+import VisSchemasProvider from 'ui/vis/schemas';
import tableVisTemplate from 'plugins/table_vis/table_vis.html';
// we need to load the css ourselves
diff --git a/src/plugins/testsBundle/findSourceFiles.js b/src/plugins/tests_bundle/find_source_files.js
similarity index 95%
rename from src/plugins/testsBundle/findSourceFiles.js
rename to src/plugins/tests_bundle/find_source_files.js
index c34d42daad62f..1557098b54993 100644
--- a/src/plugins/testsBundle/findSourceFiles.js
+++ b/src/plugins/tests_bundle/find_source_files.js
@@ -1,5 +1,5 @@
-import fromRoot from '../../utils/fromRoot';
+import fromRoot from '../../utils/from_root';
import { chain, memoize } from 'lodash';
import { resolve } from 'path';
import { map, fromNode } from 'bluebird';
diff --git a/src/plugins/testsBundle/index.js b/src/plugins/tests_bundle/index.js
similarity index 93%
rename from src/plugins/testsBundle/index.js
rename to src/plugins/tests_bundle/index.js
index cdc33ba404e58..a607e7855d414 100644
--- a/src/plugins/testsBundle/index.js
+++ b/src/plugins/tests_bundle/index.js
@@ -1,5 +1,5 @@
import { union } from 'lodash';
-import findSourceFiles from './findSourceFiles';
+import findSourceFiles from './find_source_files';
module.exports = (kibana) => {
let utils = require('requirefrom')('src/utils');
@@ -46,7 +46,7 @@ module.exports = (kibana) => {
return new UiBundle({
id: 'tests',
modules: modules,
- template: require('./testsEntryTemplate'),
+ template: require('./tests_entry_template'),
env: env
});
},
diff --git a/src/plugins/testsBundle/package.json b/src/plugins/tests_bundle/package.json
similarity index 100%
rename from src/plugins/testsBundle/package.json
rename to src/plugins/tests_bundle/package.json
diff --git a/src/plugins/testsBundle/testsEntryTemplate.js b/src/plugins/tests_bundle/tests_entry_template.js
similarity index 88%
rename from src/plugins/testsBundle/testsEntryTemplate.js
rename to src/plugins/tests_bundle/tests_entry_template.js
index aff1601d50675..0f533dc37c1d8 100644
--- a/src/plugins/testsBundle/testsEntryTemplate.js
+++ b/src/plugins/tests_bundle/tests_entry_template.js
@@ -30,9 +30,9 @@ window.__KBN__ = {
}
};
-require('ui/testHarness');
+require('ui/test_harness');
${requires}
-require('ui/testHarness').bootstrap(/* go! */);
+require('ui/test_harness').bootstrap(/* go! */);
`;
diff --git a/src/server/__tests__/basePath.js b/src/server/__tests__/base_path.js
similarity index 100%
rename from src/server/__tests__/basePath.js
rename to src/server/__tests__/base_path.js
diff --git a/src/server/config/__tests__/deepCloneWithBuffers.js b/src/server/config/__tests__/deep_clone_with_buffers.js
similarity index 96%
rename from src/server/config/__tests__/deepCloneWithBuffers.js
rename to src/server/config/__tests__/deep_clone_with_buffers.js
index 6482c5f24ed5d..02bb17c5c430c 100644
--- a/src/server/config/__tests__/deepCloneWithBuffers.js
+++ b/src/server/config/__tests__/deep_clone_with_buffers.js
@@ -1,4 +1,4 @@
-import deepCloneWithBuffers from '../deepCloneWithBuffers';
+import deepCloneWithBuffers from '../deep_clone_with_buffers';
import expect from 'expect.js';
describe('deepCloneWithBuffers()', function () {
diff --git a/src/server/config/__tests__/explodeBy.js b/src/server/config/__tests__/explode_by.js
similarity index 94%
rename from src/server/config/__tests__/explodeBy.js
rename to src/server/config/__tests__/explode_by.js
index 08e5d95e3bc22..5ca86e331ef11 100644
--- a/src/server/config/__tests__/explodeBy.js
+++ b/src/server/config/__tests__/explode_by.js
@@ -1,4 +1,4 @@
-import explodeBy from '../explodeBy';
+import explodeBy from '../explode_by';
import expect from 'expect.js';
describe('explode_by(dot, flatObject)', function () {
diff --git a/src/server/config/__tests__/flattenWith.js b/src/server/config/__tests__/flatten_with.js
similarity index 93%
rename from src/server/config/__tests__/flattenWith.js
rename to src/server/config/__tests__/flatten_with.js
index 10891cc488bb5..928c441ef4a76 100644
--- a/src/server/config/__tests__/flattenWith.js
+++ b/src/server/config/__tests__/flatten_with.js
@@ -1,4 +1,4 @@
-import flattenWith from '../flattenWith';
+import flattenWith from '../flatten_with';
import expect from 'expect.js';
describe('flatten_with(dot, nestedObj)', function () {
diff --git a/src/server/config/config.js b/src/server/config/config.js
index 0cad7df89d9fe..a26f30b9ef895 100644
--- a/src/server/config/config.js
+++ b/src/server/config/config.js
@@ -4,7 +4,7 @@ import _ from 'lodash';
import override from './override';
import createDefaultSchema from './schema';
let pkg = require('requirefrom')('src/utils')('packageJson');
-import clone from './deepCloneWithBuffers';
+import clone from './deep_clone_with_buffers';
import { zipObject } from 'lodash';
const schema = Symbol('Joi Schema');
diff --git a/src/server/config/deepCloneWithBuffers.js b/src/server/config/deep_clone_with_buffers.js
similarity index 100%
rename from src/server/config/deepCloneWithBuffers.js
rename to src/server/config/deep_clone_with_buffers.js
diff --git a/src/server/config/explodeBy.js b/src/server/config/explode_by.js
similarity index 100%
rename from src/server/config/explodeBy.js
rename to src/server/config/explode_by.js
diff --git a/src/server/config/flattenWith.js b/src/server/config/flatten_with.js
similarity index 100%
rename from src/server/config/flattenWith.js
rename to src/server/config/flatten_with.js
diff --git a/src/server/config/override.js b/src/server/config/override.js
index 146af0bc304fe..0a938f29ead3a 100644
--- a/src/server/config/override.js
+++ b/src/server/config/override.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
-import flattenWith from './flattenWith';
-import explodeBy from './explodeBy';
+import flattenWith from './flatten_with';
+import explodeBy from './explode_by';
module.exports = function (target, source) {
var _target = flattenWith('.', target);
diff --git a/src/server/http/getDefaultRoute.js b/src/server/http/get_default_route.js
similarity index 100%
rename from src/server/http/getDefaultRoute.js
rename to src/server/http/get_default_route.js
diff --git a/src/server/http/index.js b/src/server/http/index.js
index 71830d85d72f3..275cbb00e919e 100644
--- a/src/server/http/index.js
+++ b/src/server/http/index.js
@@ -4,7 +4,7 @@ import _ from 'lodash';
import fs from 'fs';
import Boom from 'boom';
import Hapi from 'hapi';
-import getDefaultRoute from './getDefaultRoute';
+import getDefaultRoute from './get_default_route';
module.exports = async function (kbnServer, server, config) {
diff --git a/src/server/KbnServer.js b/src/server/kbn_server.js
similarity index 100%
rename from src/server/KbnServer.js
rename to src/server/kbn_server.js
diff --git a/src/server/lib/commanderExtensions.js b/src/server/lib/commander_extensions.js
similarity index 100%
rename from src/server/lib/commanderExtensions.js
rename to src/server/lib/commander_extensions.js
diff --git a/src/server/logging/__tests__/applyFiltersToKeys.js b/src/server/logging/__tests__/apply_filters_to_keys.js
similarity index 92%
rename from src/server/logging/__tests__/applyFiltersToKeys.js
rename to src/server/logging/__tests__/apply_filters_to_keys.js
index f0fd46ea21e2b..fc0c520520b47 100644
--- a/src/server/logging/__tests__/applyFiltersToKeys.js
+++ b/src/server/logging/__tests__/apply_filters_to_keys.js
@@ -1,4 +1,4 @@
-import applyFiltersToKeys from '../applyFiltersToKeys';
+import applyFiltersToKeys from '../apply_filters_to_keys';
import expect from 'expect.js';
describe('applyFiltersToKeys(obj, actionsByKey)', function () {
diff --git a/src/server/logging/applyFiltersToKeys.js b/src/server/logging/apply_filters_to_keys.js
similarity index 100%
rename from src/server/logging/applyFiltersToKeys.js
rename to src/server/logging/apply_filters_to_keys.js
diff --git a/src/server/logging/index.js b/src/server/logging/index.js
index ba3bbe3ece35d..a50327518b5f0 100644
--- a/src/server/logging/index.js
+++ b/src/server/logging/index.js
@@ -44,7 +44,7 @@ module.exports = function (kbnServer, server, config) {
requestPayload: true,
reporters: [
{
- reporter: require('./LogReporter'),
+ reporter: require('./log_reporter'),
config: {
json: config.get('logging.json'),
dest: config.get('logging.dest'),
diff --git a/src/server/logging/LogFormat.js b/src/server/logging/log_format.js
similarity index 98%
rename from src/server/logging/LogFormat.js
rename to src/server/logging/log_format.js
index b4818945a982b..c1fa7a4744791 100644
--- a/src/server/logging/LogFormat.js
+++ b/src/server/logging/log_format.js
@@ -5,7 +5,7 @@ import numeral from '@spalger/numeral';
import ansicolors from 'ansicolors';
import stringify from 'json-stringify-safe';
import querystring from 'querystring';
-import applyFiltersToKeys from './applyFiltersToKeys';
+import applyFiltersToKeys from './apply_filters_to_keys';
import { inspect } from 'util';
function serializeError(err) {
diff --git a/src/server/logging/LogFormatJson.js b/src/server/logging/log_format_json.js
similarity index 88%
rename from src/server/logging/LogFormatJson.js
rename to src/server/logging/log_format_json.js
index 1db642f9e48db..7df528ab968bb 100644
--- a/src/server/logging/LogFormatJson.js
+++ b/src/server/logging/log_format_json.js
@@ -1,4 +1,4 @@
-import LogFormat from './LogFormat';
+import LogFormat from './log_format';
import stringify from 'json-stringify-safe';
let stripColors = function (string) {
diff --git a/src/server/logging/log_format_string.js b/src/server/logging/log_format_string.js
index 7de1ef695ce6a..544c15691bb9b 100644
--- a/src/server/logging/log_format_string.js
+++ b/src/server/logging/log_format_string.js
@@ -2,7 +2,7 @@ import _ from 'lodash';
import ansicolors from 'ansicolors';
import moment from 'moment';
-import LogFormat from './LogFormat';
+import LogFormat from './log_format';
let statuses = [
'err',
diff --git a/src/server/logging/LogReporter.js b/src/server/logging/log_reporter.js
similarity index 94%
rename from src/server/logging/LogReporter.js
rename to src/server/logging/log_reporter.js
index b517b931549fb..db5c1655902e8 100644
--- a/src/server/logging/LogReporter.js
+++ b/src/server/logging/log_reporter.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
-import LogFormatJson from './LogFormatJson';
+import LogFormatJson from './log_format_json';
import LogFormatString from './log_format_string';
import { Squeeze } from 'good-squeeze';
import { createWriteStream as writeStr } from 'fs';
diff --git a/src/server/plugins/Plugin.js b/src/server/plugins/plugin.js
similarity index 100%
rename from src/server/plugins/Plugin.js
rename to src/server/plugins/plugin.js
diff --git a/src/server/plugins/PluginApi.js b/src/server/plugins/plugin_api.js
similarity index 96%
rename from src/server/plugins/PluginApi.js
rename to src/server/plugins/plugin_api.js
index 5514dfd4cea20..bda666f81d543 100644
--- a/src/server/plugins/PluginApi.js
+++ b/src/server/plugins/plugin_api.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import Plugin from './Plugin';
+import Plugin from './plugin';
import { basename, join } from 'path';
module.exports = class PluginApi {
diff --git a/src/server/plugins/PluginCollection.js b/src/server/plugins/plugin_collection.js
similarity index 96%
rename from src/server/plugins/PluginCollection.js
rename to src/server/plugins/plugin_collection.js
index c3d57a73977ac..2dc1f9d1f98f2 100644
--- a/src/server/plugins/PluginCollection.js
+++ b/src/server/plugins/plugin_collection.js
@@ -1,5 +1,5 @@
-import PluginApi from './PluginApi';
+import PluginApi from './plugin_api';
import { inspect } from 'util';
import { get, indexBy } from 'lodash';
let Collection = require('requirefrom')('src')('utils/Collection');
diff --git a/src/server/plugins/scan.js b/src/server/plugins/scan.js
index 358ef049d8dc8..07af33f38c98d 100644
--- a/src/server/plugins/scan.js
+++ b/src/server/plugins/scan.js
@@ -3,7 +3,7 @@ import { fromNode } from 'bluebird';
import { readdir, stat } from 'fs';
import { resolve } from 'path';
import { each } from 'bluebird';
-import PluginCollection from './PluginCollection';
+import PluginCollection from './plugin_collection';
module.exports = async (kbnServer, server, config) => {
var plugins = kbnServer.plugins = new PluginCollection(kbnServer);
diff --git a/src/server/status/__tests__/ServerStatus.js b/src/server/status/__tests__/server_status.js
similarity index 97%
rename from src/server/status/__tests__/ServerStatus.js
rename to src/server/status/__tests__/server_status.js
index a88f308afa123..c1c4228bddfa9 100644
--- a/src/server/status/__tests__/ServerStatus.js
+++ b/src/server/status/__tests__/server_status.js
@@ -3,8 +3,8 @@ import expect from 'expect.js';
import sinon from 'sinon';
import states from '../states';
-import Status from '../Status';
-import ServerStatus from '../ServerStatus';
+import Status from '../status';
+import ServerStatus from '../server_status';
describe('ServerStatus class', function () {
var server;
diff --git a/src/server/status/__tests__/Status.js b/src/server/status/__tests__/status.js
similarity index 97%
rename from src/server/status/__tests__/Status.js
rename to src/server/status/__tests__/status.js
index 56ba7f0757580..ebac541ac96e6 100644
--- a/src/server/status/__tests__/Status.js
+++ b/src/server/status/__tests__/status.js
@@ -1,7 +1,7 @@
import expect from 'expect.js';
import sinon from 'sinon';
-import Status from '../Status';
-import ServerStatus from '../ServerStatus';
+import Status from '../status';
+import ServerStatus from '../server_status';
describe('Status class', function () {
diff --git a/src/server/status/index.js b/src/server/status/index.js
index add6b1fe06581..57284adee1b3b 100644
--- a/src/server/status/index.js
+++ b/src/server/status/index.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import ServerStatus from './ServerStatus';
+import ServerStatus from './server_status';
import { join } from 'path';
module.exports = function (kbnServer, server, config) {
diff --git a/src/server/status/metrics.js b/src/server/status/metrics.js
index af9af67a4c2b2..52b32af19bfca 100644
--- a/src/server/status/metrics.js
+++ b/src/server/status/metrics.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import Samples from './Samples';
+import Samples from './samples';
module.exports = function (kbnServer, server, config) {
let lastReport = Date.now();
diff --git a/src/server/status/Samples.js b/src/server/status/samples.js
similarity index 100%
rename from src/server/status/Samples.js
rename to src/server/status/samples.js
diff --git a/src/server/status/ServerStatus.js b/src/server/status/server_status.js
similarity index 97%
rename from src/server/status/ServerStatus.js
rename to src/server/status/server_status.js
index d9909cffd3688..4fb914ca00980 100644
--- a/src/server/status/ServerStatus.js
+++ b/src/server/status/server_status.js
@@ -1,7 +1,7 @@
import _ from 'lodash';
import states from './states';
-import Status from './Status';
+import Status from './status';
module.exports = class ServerStatus {
constructor(server) {
diff --git a/src/server/status/Status.js b/src/server/status/status.js
similarity index 100%
rename from src/server/status/Status.js
rename to src/server/status/status.js
diff --git a/src/testUtils/noDigestPromises.js b/src/test_utils/no_digest_promises.js
similarity index 100%
rename from src/testUtils/noDigestPromises.js
rename to src/test_utils/no_digest_promises.js
diff --git a/src/testUtils/simulateKeys.js b/src/test_utils/simulate_keys.js
similarity index 100%
rename from src/testUtils/simulateKeys.js
rename to src/test_utils/simulate_keys.js
diff --git a/src/testUtils/stub_index_pattern.js b/src/test_utils/stub_index_pattern.js
similarity index 97%
rename from src/testUtils/stub_index_pattern.js
rename to src/test_utils/stub_index_pattern.js
index 48311a8a1a714..7d5f2624c15c0 100644
--- a/src/testUtils/stub_index_pattern.js
+++ b/src/test_utils/stub_index_pattern.js
@@ -1,7 +1,7 @@
import _ from 'lodash';
import sinon from 'sinon';
import Promise from 'bluebird';
-import IndexedArray from 'ui/IndexedArray';
+import IndexedArray from 'ui/indexed_array';
import IndexPattern from 'ui/index_patterns/_index_pattern';
import formatHit from 'ui/index_patterns/_format_hit';
import getComputedFields from 'ui/index_patterns/_get_computed_fields';
diff --git a/src/ui/index.js b/src/ui/index.js
index 2c3981c5fadf4..4da9547f32cf0 100644
--- a/src/ui/index.js
+++ b/src/ui/index.js
@@ -3,7 +3,7 @@ import { readFileSync as readFile } from 'fs';
import { defaults } from 'lodash';
import Boom from 'boom';
import { resolve } from 'path';
-import fromRoot from '../utils/fromRoot';
+import fromRoot from '../utils/from_root';
import UiExports from './ui_exports';
import UiBundle from './ui_bundle';
import UiBundleCollection from './ui_bundle_collection';
diff --git a/src/ui/public/Vis/__tests__/index.js b/src/ui/public/Vis/__tests__/index.js
deleted file mode 100644
index f6facc7fbcfcf..0000000000000
--- a/src/ui/public/Vis/__tests__/index.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import './_AggConfig';
-import './_AggConfigResult';
-import './_AggConfigs';
-import './_Vis';
-describe('Vis Component', function () {
-});
diff --git a/src/ui/public/agg_response/geo_json/__tests__/geo_json.js b/src/ui/public/agg_response/geo_json/__tests__/geo_json.js
index 914f0f2036f1a..55466e4a583ac 100644
--- a/src/ui/public/agg_response/geo_json/__tests__/geo_json.js
+++ b/src/ui/public/agg_response/geo_json/__tests__/geo_json.js
@@ -2,7 +2,7 @@
import _ from 'lodash';
import expect from 'expect.js';
import ngMock from 'ngMock';
-import VisProvider from 'ui/Vis';
+import VisProvider from 'ui/vis';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
import FixturesAggRespGeohashGridProvider from 'fixtures/agg_resp/geohash_grid';
import AggResponseTabifyTabifyProvider from 'ui/agg_response/tabify/tabify';
diff --git a/src/ui/public/agg_response/geo_json/geo_json.js b/src/ui/public/agg_response/geo_json/geo_json.js
index e5a9d11bb364f..c0e0b9b52e4b7 100644
--- a/src/ui/public/agg_response/geo_json/geo_json.js
+++ b/src/ui/public/agg_response/geo_json/geo_json.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import rowsToFeatures from 'ui/agg_response/geo_json/rowsToFeatures';
+import rowsToFeatures from 'ui/agg_response/geo_json/rows_to_features';
import AggResponseGeoJsonTooltipFormatterProvider from 'ui/agg_response/geo_json/_tooltip_formatter';
export default function TileMapConverterFn(Private, timefilter, $compile, $rootScope) {
diff --git a/src/ui/public/agg_response/geo_json/rowsToFeatures.js b/src/ui/public/agg_response/geo_json/rows_to_features.js
similarity index 96%
rename from src/ui/public/agg_response/geo_json/rowsToFeatures.js
rename to src/ui/public/agg_response/geo_json/rows_to_features.js
index b80ef6086673a..6c65e09ab35b1 100644
--- a/src/ui/public/agg_response/geo_json/rowsToFeatures.js
+++ b/src/ui/public/agg_response/geo_json/rows_to_features.js
@@ -1,5 +1,5 @@
import decodeGeoHash from 'ui/utils/decode_geo_hash';
-import AggConfigResult from 'ui/Vis/AggConfigResult';
+import AggConfigResult from 'ui/vis/agg_config_result';
import _ from 'lodash';
function getAcr(val) {
diff --git a/src/ui/public/agg_response/hierarchical/__tests__/build_hierarchical_data.js b/src/ui/public/agg_response/hierarchical/__tests__/build_hierarchical_data.js
index dc444ce650040..3cecb26b18c06 100644
--- a/src/ui/public/agg_response/hierarchical/__tests__/build_hierarchical_data.js
+++ b/src/ui/public/agg_response/hierarchical/__tests__/build_hierarchical_data.js
@@ -4,8 +4,8 @@ import fixtures from 'fixtures/fake_hierarchical_data';
import sinon from 'auto-release-sinon';
import expect from 'expect.js';
import ngMock from 'ngMock';
-import VisProvider from 'ui/Vis';
-import VisAggConfigsProvider from 'ui/Vis/AggConfigs';
+import VisProvider from 'ui/vis';
+import VisAggConfigsProvider from 'ui/vis/agg_configs';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
import AggResponseHierarchicalBuildHierarchicalDataProvider from 'ui/agg_response/hierarchical/build_hierarchical_data';
diff --git a/src/ui/public/agg_response/hierarchical/__tests__/create_raw_data.js b/src/ui/public/agg_response/hierarchical/__tests__/create_raw_data.js
index fcf386cc73109..a34a311ad2023 100644
--- a/src/ui/public/agg_response/hierarchical/__tests__/create_raw_data.js
+++ b/src/ui/public/agg_response/hierarchical/__tests__/create_raw_data.js
@@ -5,8 +5,8 @@ import createRawData from 'ui/agg_response/hierarchical/_create_raw_data';
import arrayToLinkedList from 'ui/agg_response/hierarchical/_array_to_linked_list';
import expect from 'expect.js';
import ngMock from 'ngMock';
-import VisProvider from 'ui/Vis';
-import VisAggConfigsProvider from 'ui/Vis/AggConfigs';
+import VisProvider from 'ui/vis';
+import VisAggConfigsProvider from 'ui/vis/agg_configs';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
var AggConfigs;
diff --git a/src/ui/public/agg_response/hierarchical/_transform_aggregation.js b/src/ui/public/agg_response/hierarchical/_transform_aggregation.js
index 199a2fcd0b178..6078989cd13b3 100644
--- a/src/ui/public/agg_response/hierarchical/_transform_aggregation.js
+++ b/src/ui/public/agg_response/hierarchical/_transform_aggregation.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
import extractBuckets from 'ui/agg_response/hierarchical/_extract_buckets';
-import AggConfigResult from 'ui/Vis/AggConfigResult';
+import AggConfigResult from 'ui/vis/agg_config_result';
export default function transformAggregationProvider(Private) {
return function transformAggregation(agg, metric, aggData, parent) {
return _.map(extractBuckets(aggData, agg), function (bucket) {
diff --git a/src/ui/public/agg_response/hierarchical/build_hierarchical_data.js b/src/ui/public/agg_response/hierarchical/build_hierarchical_data.js
index fe58f2f19dff5..7c64f4285c65a 100644
--- a/src/ui/public/agg_response/hierarchical/build_hierarchical_data.js
+++ b/src/ui/public/agg_response/hierarchical/build_hierarchical_data.js
@@ -2,7 +2,7 @@ import _ from 'lodash';
import extractBuckets from 'ui/agg_response/hierarchical/_extract_buckets';
import createRawData from 'ui/agg_response/hierarchical/_create_raw_data';
import arrayToLinkedList from 'ui/agg_response/hierarchical/_array_to_linked_list';
-import AggConfigResult from 'ui/Vis/AggConfigResult';
+import AggConfigResult from 'ui/vis/agg_config_result';
import AggResponseHierarchicalBuildSplitProvider from 'ui/agg_response/hierarchical/_build_split';
import AggResponseHierarchicalHierarchicalTooltipFormatterProvider from 'ui/agg_response/hierarchical/_hierarchical_tooltip_formatter';
export default function buildHierarchicalDataProvider(Private, Notifier) {
diff --git a/src/ui/public/agg_response/point_series/__tests__/_fake_x_aspect.js b/src/ui/public/agg_response/point_series/__tests__/_fake_x_aspect.js
index d98b80b3a1772..9fe50931b2020 100644
--- a/src/ui/public/agg_response/point_series/__tests__/_fake_x_aspect.js
+++ b/src/ui/public/agg_response/point_series/__tests__/_fake_x_aspect.js
@@ -1,8 +1,8 @@
import expect from 'expect.js';
import ngMock from 'ngMock';
-import VisProvider from 'ui/Vis';
-import VisAggConfigProvider from 'ui/Vis/AggConfig';
-import AggTypesAggTypeProvider from 'ui/agg_types/AggType';
+import VisProvider from 'ui/vis';
+import VisAggConfigProvider from 'ui/vis/agg_config';
+import AggTypesAggTypeProvider from 'ui/agg_types/agg_type';
import AggResponsePointSeriesFakeXAspectProvider from 'ui/agg_response/point_series/_fake_x_aspect';
describe('makeFakeXAspect', function () {
diff --git a/src/ui/public/agg_response/point_series/__tests__/_get_aspects.js b/src/ui/public/agg_response/point_series/__tests__/_get_aspects.js
index 6e0ed60cacb34..ef154c3220054 100644
--- a/src/ui/public/agg_response/point_series/__tests__/_get_aspects.js
+++ b/src/ui/public/agg_response/point_series/__tests__/_get_aspects.js
@@ -2,9 +2,9 @@ import _ from 'lodash';
import moment from 'moment';
import expect from 'expect.js';
import ngMock from 'ngMock';
-import VisProvider from 'ui/Vis';
+import VisProvider from 'ui/vis';
import AggResponsePointSeriesAddToSiriProvider from 'ui/agg_response/point_series/_add_to_siri';
-import VisAggConfigProvider from 'ui/Vis/AggConfig';
+import VisAggConfigProvider from 'ui/vis/agg_config';
import AggResponsePointSeriesGetAspectsProvider from 'ui/agg_response/point_series/_get_aspects';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
describe('getAspects', function () {
diff --git a/src/ui/public/agg_response/point_series/__tests__/_main.js b/src/ui/public/agg_response/point_series/__tests__/_main.js
index e8ab322b89395..76e7ee001f302 100644
--- a/src/ui/public/agg_response/point_series/__tests__/_main.js
+++ b/src/ui/public/agg_response/point_series/__tests__/_main.js
@@ -1,9 +1,9 @@
import _ from 'lodash';
import moment from 'moment';
-import AggConfigResult from 'ui/Vis/AggConfigResult';
+import AggConfigResult from 'ui/vis/agg_config_result';
import expect from 'expect.js';
import ngMock from 'ngMock';
-import VisProvider from 'ui/Vis';
+import VisProvider from 'ui/vis';
import AggResponseTabifyTableProvider from 'ui/agg_response/tabify/_table';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
import AggResponsePointSeriesPointSeriesProvider from 'ui/agg_response/point_series/point_series';
diff --git a/src/ui/public/agg_response/point_series/_fake_x_aspect.js b/src/ui/public/agg_response/point_series/_fake_x_aspect.js
index 52bdc510daf64..a88978181b087 100644
--- a/src/ui/public/agg_response/point_series/_fake_x_aspect.js
+++ b/src/ui/public/agg_response/point_series/_fake_x_aspect.js
@@ -1,5 +1,5 @@
-import VisAggConfigProvider from 'ui/Vis/AggConfig';
-import AggTypesAggTypeProvider from 'ui/agg_types/AggType';
+import VisAggConfigProvider from 'ui/vis/agg_config';
+import AggTypesAggTypeProvider from 'ui/agg_types/agg_type';
export default function PointSeriesFakeXAxis(Private) {
var AggConfig = Private(VisAggConfigProvider);
diff --git a/src/ui/public/agg_response/tabify/__tests__/_get_columns.js b/src/ui/public/agg_response/tabify/__tests__/_get_columns.js
index 4af94e212f284..92add315f7b9f 100644
--- a/src/ui/public/agg_response/tabify/__tests__/_get_columns.js
+++ b/src/ui/public/agg_response/tabify/__tests__/_get_columns.js
@@ -1,7 +1,7 @@
import expect from 'expect.js';
import ngMock from 'ngMock';
import AggResponseTabifyGetColumnsProvider from 'ui/agg_response/tabify/_get_columns';
-import VisProvider from 'ui/Vis';
+import VisProvider from 'ui/vis';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
describe('get columns', function () {
var getColumns;
diff --git a/src/ui/public/agg_response/tabify/__tests__/_integration.js b/src/ui/public/agg_response/tabify/__tests__/_integration.js
index b686d30ac5f46..05f9a99557e8d 100644
--- a/src/ui/public/agg_response/tabify/__tests__/_integration.js
+++ b/src/ui/public/agg_response/tabify/__tests__/_integration.js
@@ -3,7 +3,7 @@ import fixtures from 'fixtures/fake_hierarchical_data';
import expect from 'expect.js';
import ngMock from 'ngMock';
import AggResponseTabifyTabifyProvider from 'ui/agg_response/tabify/tabify';
-import VisProvider from 'ui/Vis';
+import VisProvider from 'ui/vis';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
describe('tabifyAggResponse Integration', function () {
diff --git a/src/ui/public/agg_response/tabify/__tests__/_response_writer.js b/src/ui/public/agg_response/tabify/__tests__/_response_writer.js
index d325a51f739ec..30c9ba1bd7f23 100644
--- a/src/ui/public/agg_response/tabify/__tests__/_response_writer.js
+++ b/src/ui/public/agg_response/tabify/__tests__/_response_writer.js
@@ -6,7 +6,7 @@ import AggResponseTabifyResponseWriterProvider from 'ui/agg_response/tabify/_res
import AggResponseTabifyTableGroupProvider from 'ui/agg_response/tabify/_table_group';
import AggResponseTabifyBucketsProvider from 'ui/agg_response/tabify/_buckets';
import AggResponseTabifyTableProvider from 'ui/agg_response/tabify/_table';
-import VisProvider from 'ui/Vis';
+import VisProvider from 'ui/vis';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
describe('ResponseWriter class', function () {
diff --git a/src/ui/public/agg_response/tabify/_get_columns.js b/src/ui/public/agg_response/tabify/_get_columns.js
index aae442938a8e0..1ddda56b14179 100644
--- a/src/ui/public/agg_response/tabify/_get_columns.js
+++ b/src/ui/public/agg_response/tabify/_get_columns.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import VisAggConfigProvider from 'ui/Vis/AggConfig';
+import VisAggConfigProvider from 'ui/vis/agg_config';
export default function GetColumnsProvider(Private) {
var AggConfig = Private(VisAggConfigProvider);
diff --git a/src/ui/public/agg_response/tabify/_response_writer.js b/src/ui/public/agg_response/tabify/_response_writer.js
index 2e629ae3b6ba3..be27f4518dc93 100644
--- a/src/ui/public/agg_response/tabify/_response_writer.js
+++ b/src/ui/public/agg_response/tabify/_response_writer.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import AggConfigResult from 'ui/Vis/AggConfigResult';
+import AggConfigResult from 'ui/vis/agg_config_result';
import AggResponseTabifyTableProvider from 'ui/agg_response/tabify/_table';
import AggResponseTabifyTableGroupProvider from 'ui/agg_response/tabify/_table_group';
import AggResponseTabifyGetColumnsProvider from 'ui/agg_response/tabify/_get_columns';
diff --git a/src/ui/public/agg_response/tabify/tabify.js b/src/ui/public/agg_response/tabify/tabify.js
index 8b5d35a7b0160..a74a340dc52e8 100644
--- a/src/ui/public/agg_response/tabify/tabify.js
+++ b/src/ui/public/agg_response/tabify/tabify.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import VisAggConfigProvider from 'ui/Vis/AggConfig';
+import VisAggConfigProvider from 'ui/vis/agg_config';
import AggResponseTabifyResponseWriterProvider from 'ui/agg_response/tabify/_response_writer';
import AggResponseTabifyBucketsProvider from 'ui/agg_response/tabify/_buckets';
export default function tabifyAggResponseProvider(Private, Notifier) {
diff --git a/src/ui/public/agg_table/__tests__/_group.js b/src/ui/public/agg_table/__tests__/_group.js
index bbc8bc4bd869c..f3caf0223e83f 100644
--- a/src/ui/public/agg_table/__tests__/_group.js
+++ b/src/ui/public/agg_table/__tests__/_group.js
@@ -5,7 +5,7 @@ import expect from 'expect.js';
import fixtures from 'fixtures/fake_hierarchical_data';
import AggResponseTabifyTabifyProvider from 'ui/agg_response/tabify/tabify';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
-import VisProvider from 'ui/Vis';
+import VisProvider from 'ui/vis';
describe('AggTableGroup Directive', function () {
var $rootScope;
diff --git a/src/ui/public/agg_table/__tests__/_table.js b/src/ui/public/agg_table/__tests__/_table.js
index f5a385bf49976..e0f2ad2d56987 100644
--- a/src/ui/public/agg_table/__tests__/_table.js
+++ b/src/ui/public/agg_table/__tests__/_table.js
@@ -6,7 +6,7 @@ import fixtures from 'fixtures/fake_hierarchical_data';
import sinon from 'auto-release-sinon';
import AggResponseTabifyTabifyProvider from 'ui/agg_response/tabify/tabify';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
-import VisProvider from 'ui/Vis';
+import VisProvider from 'ui/vis';
describe('AggTable Directive', function () {
var $rootScope;
diff --git a/src/ui/public/agg_types/__tests__/AggParamWriter.js b/src/ui/public/agg_types/__tests__/agg_param_writer.js
similarity index 99%
rename from src/ui/public/agg_types/__tests__/AggParamWriter.js
rename to src/ui/public/agg_types/__tests__/agg_param_writer.js
index 4ff401f28b2c0..ed9a12c043a06 100644
--- a/src/ui/public/agg_types/__tests__/AggParamWriter.js
+++ b/src/ui/public/agg_types/__tests__/agg_param_writer.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import VisProvider from 'ui/Vis';
+import VisProvider from 'ui/vis';
import AggTypesIndexProvider from 'ui/agg_types/index';
import RegistryVisTypesProvider from 'ui/registry/vis_types';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
diff --git a/src/ui/public/agg_types/__tests__/AggParams.js b/src/ui/public/agg_types/__tests__/agg_params.js
similarity index 98%
rename from src/ui/public/agg_types/__tests__/AggParams.js
rename to src/ui/public/agg_types/__tests__/agg_params.js
index 45d28dfe0d851..358bfbb02af83 100644
--- a/src/ui/public/agg_types/__tests__/AggParams.js
+++ b/src/ui/public/agg_types/__tests__/agg_params.js
@@ -1,7 +1,7 @@
import _ from 'lodash';
import ngMock from 'ngMock';
import expect from 'expect.js';
-import AggTypesAggParamsProvider from 'ui/agg_types/AggParams';
+import AggTypesAggParamsProvider from 'ui/agg_types/agg_params';
import AggTypesParamTypesBaseProvider from 'ui/agg_types/param_types/base';
import AggTypesParamTypesFieldProvider from 'ui/agg_types/param_types/field';
import AggTypesParamTypesOptionedProvider from 'ui/agg_types/param_types/optioned';
diff --git a/src/ui/public/agg_types/__tests__/AggType.js b/src/ui/public/agg_types/__tests__/agg_type.js
similarity index 96%
rename from src/ui/public/agg_types/__tests__/AggType.js
rename to src/ui/public/agg_types/__tests__/agg_type.js
index 5af85a362e33f..136886d9f51db 100644
--- a/src/ui/public/agg_types/__tests__/AggType.js
+++ b/src/ui/public/agg_types/__tests__/agg_type.js
@@ -3,11 +3,11 @@ import expect from 'expect.js';
import ngMock from 'ngMock';
import sinon from 'auto-release-sinon';
import 'ui/private';
-import AggParamsPM from 'ui/agg_types/AggParams';
-import VisProvider from 'ui/Vis';
+import AggParamsPM from 'ui/agg_types/agg_params';
+import VisProvider from 'ui/vis';
import RegistryFieldFormatsProvider from 'ui/registry/field_formats';
-import AggTypesAggTypeProvider from 'ui/agg_types/AggType';
-import VisAggConfigProvider from 'ui/Vis/AggConfig';
+import AggTypesAggTypeProvider from 'ui/agg_types/agg_type';
+import VisAggConfigProvider from 'ui/vis/agg_config';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
describe('AggType Class', function () {
var AggType;
diff --git a/src/ui/public/agg_types/__tests__/bucketCountBetween.js b/src/ui/public/agg_types/__tests__/bucket_count_between.js
similarity index 98%
rename from src/ui/public/agg_types/__tests__/bucketCountBetween.js
rename to src/ui/public/agg_types/__tests__/bucket_count_between.js
index 67fdddc537fe7..083698dce3a70 100644
--- a/src/ui/public/agg_types/__tests__/bucketCountBetween.js
+++ b/src/ui/public/agg_types/__tests__/bucket_count_between.js
@@ -2,10 +2,10 @@ import _ from 'lodash';
import expect from 'expect.js';
import ngMock from 'ngMock';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
-import VisProvider from 'ui/Vis';
+import VisProvider from 'ui/vis';
import RegistryVisTypesProvider from 'ui/registry/vis_types';
import AggTypesIndexProvider from 'ui/agg_types/index';
-import VisAggConfigProvider from 'ui/Vis/AggConfig';
+import VisAggConfigProvider from 'ui/vis/agg_config';
import AggTypesBucketsBucketCountBetweenProvider from 'ui/agg_types/buckets/_bucket_count_between';
describe('bucketCountBetween util', function () {
var indexPattern;
diff --git a/src/ui/public/agg_types/__tests__/buckets/_histogram.js b/src/ui/public/agg_types/__tests__/buckets/_histogram.js
index 0aa6a3122bd5b..57a4c02a59550 100644
--- a/src/ui/public/agg_types/__tests__/buckets/_histogram.js
+++ b/src/ui/public/agg_types/__tests__/buckets/_histogram.js
@@ -2,7 +2,7 @@ import _ from 'lodash';
import expect from 'expect.js';
import ngMock from 'ngMock';
import AggTypesIndexProvider from 'ui/agg_types/index';
-import AggParamWriterProvider from '../AggParamWriter';
+import AggParamWriterProvider from '../agg_param_writer';
describe('Histogram Agg', function () {
describe('ordered', function () {
diff --git a/src/ui/public/agg_types/__tests__/buckets/_range.js b/src/ui/public/agg_types/__tests__/buckets/_range.js
index bc80276961b96..57578fc3ec851 100644
--- a/src/ui/public/agg_types/__tests__/buckets/_range.js
+++ b/src/ui/public/agg_types/__tests__/buckets/_range.js
@@ -4,7 +4,7 @@ import ngMock from 'ngMock';
import expect from 'expect.js';
import resp from 'fixtures/agg_resp/range';
import AggTypesIndexProvider from 'ui/agg_types/index';
-import VisProvider from 'ui/Vis';
+import VisProvider from 'ui/vis';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
import RegistryFieldFormatsProvider from 'ui/registry/field_formats';
describe('Range Agg', function () {
diff --git a/src/ui/public/agg_types/__tests__/buckets/create_filter/date_histogram.js b/src/ui/public/agg_types/__tests__/buckets/create_filter/date_histogram.js
index 5ffc20e4e81f9..8e9d08ccc5b99 100644
--- a/src/ui/public/agg_types/__tests__/buckets/create_filter/date_histogram.js
+++ b/src/ui/public/agg_types/__tests__/buckets/create_filter/date_histogram.js
@@ -4,7 +4,7 @@ import sinon from 'auto-release-sinon';
import aggResp from 'fixtures/agg_resp/date_histogram';
import ngMock from 'ngMock';
import expect from 'expect.js';
-import VisProvider from 'ui/Vis';
+import VisProvider from 'ui/vis';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
import AggTypesBucketsCreateFilterDateHistogramProvider from 'ui/agg_types/buckets/create_filter/date_histogram';
import TimeBucketsProvider from 'ui/time_buckets';
diff --git a/src/ui/public/agg_types/__tests__/buckets/create_filter/date_range.js b/src/ui/public/agg_types/__tests__/buckets/create_filter/date_range.js
index 55b37c2001ab8..960da20d60d58 100644
--- a/src/ui/public/agg_types/__tests__/buckets/create_filter/date_range.js
+++ b/src/ui/public/agg_types/__tests__/buckets/create_filter/date_range.js
@@ -2,8 +2,8 @@
import moment from 'moment';
import expect from 'expect.js';
import ngMock from 'ngMock';
-import VisProvider from 'ui/Vis';
-import VisAggConfigProvider from 'ui/Vis/AggConfig';
+import VisProvider from 'ui/vis';
+import VisAggConfigProvider from 'ui/vis/agg_config';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
import AggTypesBucketsCreateFilterDateRangeProvider from 'ui/agg_types/buckets/create_filter/date_range';
diff --git a/src/ui/public/agg_types/__tests__/buckets/create_filter/filters.js b/src/ui/public/agg_types/__tests__/buckets/create_filter/filters.js
index 1694908238cd6..c8b96ffb6fea0 100644
--- a/src/ui/public/agg_types/__tests__/buckets/create_filter/filters.js
+++ b/src/ui/public/agg_types/__tests__/buckets/create_filter/filters.js
@@ -2,8 +2,8 @@
import _ from 'lodash';
import expect from 'expect.js';
import ngMock from 'ngMock';
-import VisProvider from 'ui/Vis';
-import VisAggConfigProvider from 'ui/Vis/AggConfig';
+import VisProvider from 'ui/vis';
+import VisAggConfigProvider from 'ui/vis/agg_config';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
import AggTypesBucketsCreateFilterFiltersProvider from 'ui/agg_types/buckets/create_filter/filters';
diff --git a/src/ui/public/agg_types/__tests__/buckets/create_filter/histogram.js b/src/ui/public/agg_types/__tests__/buckets/create_filter/histogram.js
index 9cb00383b49f0..2891d8d1e21d5 100644
--- a/src/ui/public/agg_types/__tests__/buckets/create_filter/histogram.js
+++ b/src/ui/public/agg_types/__tests__/buckets/create_filter/histogram.js
@@ -2,8 +2,8 @@
import _ from 'lodash';
import expect from 'expect.js';
import ngMock from 'ngMock';
-import VisProvider from 'ui/Vis';
-import VisAggConfigProvider from 'ui/Vis/AggConfig';
+import VisProvider from 'ui/vis';
+import VisAggConfigProvider from 'ui/vis/agg_config';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
import AggTypesBucketsCreateFilterHistogramProvider from 'ui/agg_types/buckets/create_filter/histogram';
diff --git a/src/ui/public/agg_types/__tests__/buckets/create_filter/ip_range.js b/src/ui/public/agg_types/__tests__/buckets/create_filter/ip_range.js
index e394b19345cfd..591c72e0060f1 100644
--- a/src/ui/public/agg_types/__tests__/buckets/create_filter/ip_range.js
+++ b/src/ui/public/agg_types/__tests__/buckets/create_filter/ip_range.js
@@ -1,7 +1,7 @@
import expect from 'expect.js';
import ngMock from 'ngMock';
-import VisProvider from 'ui/Vis';
-import VisAggConfigProvider from 'ui/Vis/AggConfig';
+import VisProvider from 'ui/vis';
+import VisAggConfigProvider from 'ui/vis/agg_config';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
import AggTypesBucketsCreateFilterIpRangeProvider from 'ui/agg_types/buckets/create_filter/ip_range';
describe('AggConfig Filters', function () {
diff --git a/src/ui/public/agg_types/__tests__/buckets/create_filter/range.js b/src/ui/public/agg_types/__tests__/buckets/create_filter/range.js
index d5fb7013adad9..fd90b3d2356a4 100644
--- a/src/ui/public/agg_types/__tests__/buckets/create_filter/range.js
+++ b/src/ui/public/agg_types/__tests__/buckets/create_filter/range.js
@@ -1,7 +1,7 @@
import expect from 'expect.js';
import ngMock from 'ngMock';
-import VisProvider from 'ui/Vis';
-import VisAggConfigProvider from 'ui/Vis/AggConfig';
+import VisProvider from 'ui/vis';
+import VisAggConfigProvider from 'ui/vis/agg_config';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
import AggTypesBucketsCreateFilterRangeProvider from 'ui/agg_types/buckets/create_filter/range';
describe('AggConfig Filters', function () {
diff --git a/src/ui/public/agg_types/__tests__/buckets/create_filter/terms.js b/src/ui/public/agg_types/__tests__/buckets/create_filter/terms.js
index e6c636afe900a..42c92c50cfa25 100644
--- a/src/ui/public/agg_types/__tests__/buckets/create_filter/terms.js
+++ b/src/ui/public/agg_types/__tests__/buckets/create_filter/terms.js
@@ -1,7 +1,7 @@
import expect from 'expect.js';
import ngMock from 'ngMock';
-import VisProvider from 'ui/Vis';
-import VisAggConfigProvider from 'ui/Vis/AggConfig';
+import VisProvider from 'ui/vis';
+import VisAggConfigProvider from 'ui/vis/agg_config';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
import AggTypesBucketsCreateFilterTermsProvider from 'ui/agg_types/buckets/create_filter/terms';
describe('AggConfig Filters', function () {
diff --git a/src/ui/public/agg_types/__tests__/buckets/date_histogram/_editor.js b/src/ui/public/agg_types/__tests__/buckets/date_histogram/_editor.js
index 18a5d0ff37cf4..ae78969872d0c 100644
--- a/src/ui/public/agg_types/__tests__/buckets/date_histogram/_editor.js
+++ b/src/ui/public/agg_types/__tests__/buckets/date_histogram/_editor.js
@@ -3,7 +3,7 @@ import $ from 'jquery';
import ngMock from 'ngMock';
import expect from 'expect.js';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
-import VisProvider from 'ui/Vis';
+import VisProvider from 'ui/vis';
import AggTypesBucketsIntervalOptionsProvider from 'ui/agg_types/buckets/_interval_options';
describe('editor', function () {
diff --git a/src/ui/public/agg_types/__tests__/buckets/date_histogram/_params.js b/src/ui/public/agg_types/__tests__/buckets/date_histogram/_params.js
index 406e0484313c9..4e3e73d7d5b1f 100644
--- a/src/ui/public/agg_types/__tests__/buckets/date_histogram/_params.js
+++ b/src/ui/public/agg_types/__tests__/buckets/date_histogram/_params.js
@@ -2,10 +2,10 @@ import _ from 'lodash';
import moment from 'moment';
import expect from 'expect.js';
import ngMock from 'ngMock';
-import AggParamWriterProvider from '../../AggParamWriter';
+import AggParamWriterProvider from '../../agg_param_writer';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
import AggTypesIndexProvider from 'ui/agg_types/index';
-import VisAggConfigProvider from 'ui/Vis/AggConfig';
+import VisAggConfigProvider from 'ui/vis/agg_config';
describe('params', function () {
var paramWriter;
diff --git a/src/ui/public/agg_types/__tests__/index.js b/src/ui/public/agg_types/__tests__/index.js
index a180083ae82c0..b62ab7f106ecb 100644
--- a/src/ui/public/agg_types/__tests__/index.js
+++ b/src/ui/public/agg_types/__tests__/index.js
@@ -1,13 +1,13 @@
import expect from 'expect.js';
import ngMock from 'ngMock';
-import './AggType';
-import './AggParams';
-import './bucketCountBetween';
+import './agg_type';
+import './agg_params';
+import './bucket_count_between';
import './buckets/_histogram';
import './buckets/_range';
import AggTypesIndexProvider from 'ui/agg_types/index';
import AggTypesBucketsBucketAggTypeProvider from 'ui/agg_types/buckets/_bucket_agg_type';
-import AggTypesMetricsMetricAggTypeProvider from 'ui/agg_types/metrics/MetricAggType';
+import AggTypesMetricsMetricAggTypeProvider from 'ui/agg_types/metrics/metric_agg_type';
describe('AggTypesComponent', function () {
diff --git a/src/ui/public/agg_types/__tests__/param_types/_calculate_interval.js b/src/ui/public/agg_types/__tests__/param_types/_calculate_interval.js
index 19c993cca8e90..bbac693066a37 100644
--- a/src/ui/public/agg_types/__tests__/param_types/_calculate_interval.js
+++ b/src/ui/public/agg_types/__tests__/param_types/_calculate_interval.js
@@ -1,8 +1,8 @@
import _ from 'lodash';
import expect from 'expect.js';
import ngMock from 'ngMock';
-import VisProvider from 'ui/Vis';
-import VisAggConfigProvider from 'ui/Vis/AggConfig';
+import VisProvider from 'ui/vis';
+import VisAggConfigProvider from 'ui/vis/agg_config';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
import AggTypesParamTypesCalculateIntervalProvider from 'ui/agg_types/param_types/_calculate_interval';
diff --git a/src/ui/public/agg_types/__tests__/param_types/_regex.js b/src/ui/public/agg_types/__tests__/param_types/_regex.js
index 9f89bc6a3e9e3..1dcd9e7aa8094 100644
--- a/src/ui/public/agg_types/__tests__/param_types/_regex.js
+++ b/src/ui/public/agg_types/__tests__/param_types/_regex.js
@@ -3,7 +3,7 @@ import expect from 'expect.js';
import ngMock from 'ngMock';
import AggTypesParamTypesBaseProvider from 'ui/agg_types/param_types/base';
import AggTypesParamTypesRegexProvider from 'ui/agg_types/param_types/regex';
-import VisProvider from 'ui/Vis';
+import VisProvider from 'ui/vis';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
describe('Regex', function () {
diff --git a/src/ui/public/agg_types/AggParams.js b/src/ui/public/agg_types/agg_params.js
similarity index 98%
rename from src/ui/public/agg_types/AggParams.js
rename to src/ui/public/agg_types/agg_params.js
index 1cb60963eef75..1c5aa3a52e328 100644
--- a/src/ui/public/agg_types/AggParams.js
+++ b/src/ui/public/agg_types/agg_params.js
@@ -1,6 +1,6 @@
import 'ui/filters/label';
import _ from 'lodash';
-import IndexedArray from 'ui/IndexedArray';
+import IndexedArray from 'ui/indexed_array';
import AggTypesParamTypesFieldProvider from 'ui/agg_types/param_types/field';
import AggTypesParamTypesOptionedProvider from 'ui/agg_types/param_types/optioned';
import AggTypesParamTypesRegexProvider from 'ui/agg_types/param_types/regex';
diff --git a/src/ui/public/agg_types/AggType.js b/src/ui/public/agg_types/agg_type.js
similarity index 98%
rename from src/ui/public/agg_types/AggType.js
rename to src/ui/public/agg_types/agg_type.js
index 92e53ef7969a3..d262d50776648 100644
--- a/src/ui/public/agg_types/AggType.js
+++ b/src/ui/public/agg_types/agg_type.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import AggTypesAggParamsProvider from 'ui/agg_types/AggParams';
+import AggTypesAggParamsProvider from 'ui/agg_types/agg_params';
import RegistryFieldFormatsProvider from 'ui/registry/field_formats';
export default function AggTypeFactory(Private) {
var AggParams = Private(AggTypesAggParamsProvider);
diff --git a/src/ui/public/agg_types/buckets/_bucket_agg_type.js b/src/ui/public/agg_types/buckets/_bucket_agg_type.js
index 830cd635fbee1..d47006baa55ed 100644
--- a/src/ui/public/agg_types/buckets/_bucket_agg_type.js
+++ b/src/ui/public/agg_types/buckets/_bucket_agg_type.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import AggTypesAggTypeProvider from 'ui/agg_types/AggType';
+import AggTypesAggTypeProvider from 'ui/agg_types/agg_type';
export default function BucketAggTypeProvider(Private) {
var AggType = Private(AggTypesAggTypeProvider);
diff --git a/src/ui/public/agg_types/buckets/create_filter/ip_range.js b/src/ui/public/agg_types/buckets/create_filter/ip_range.js
index c28fe940afa0e..d71e36bf09a9b 100644
--- a/src/ui/public/agg_types/buckets/create_filter/ip_range.js
+++ b/src/ui/public/agg_types/buckets/create_filter/ip_range.js
@@ -1,4 +1,4 @@
-import CidrMask from 'ui/utils/CidrMask';
+import CidrMask from 'ui/utils/cidr_mask';
import buildRangeFilter from 'ui/filter_manager/lib/range';
export default function createIpRangeFilterProvider() {
return function (aggConfig, key) {
diff --git a/src/ui/public/agg_types/buckets/date_histogram.js b/src/ui/public/agg_types/buckets/date_histogram.js
index cd4c988a249d4..485ce7e664d09 100644
--- a/src/ui/public/agg_types/buckets/date_histogram.js
+++ b/src/ui/public/agg_types/buckets/date_histogram.js
@@ -2,7 +2,7 @@ import { jstz as tzDetect } from 'jstimezonedetect';
import _ from 'lodash';
import moment from 'moment';
import 'ui/filters/field_type';
-import 'ui/validateDateInterval';
+import 'ui/validate_date_interval';
import AggTypesBucketsBucketAggTypeProvider from 'ui/agg_types/buckets/_bucket_agg_type';
import TimeBucketsProvider from 'ui/time_buckets';
import AggTypesBucketsCreateFilterDateHistogramProvider from 'ui/agg_types/buckets/create_filter/date_histogram';
diff --git a/src/ui/public/agg_types/buckets/histogram.js b/src/ui/public/agg_types/buckets/histogram.js
index 14d292444b834..485f722b81d2f 100644
--- a/src/ui/public/agg_types/buckets/histogram.js
+++ b/src/ui/public/agg_types/buckets/histogram.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
import moment from 'moment';
-import 'ui/validateDateInterval';
+import 'ui/validate_date_interval';
import AggTypesBucketsBucketAggTypeProvider from 'ui/agg_types/buckets/_bucket_agg_type';
import AggTypesBucketsCreateFilterHistogramProvider from 'ui/agg_types/buckets/create_filter/histogram';
import intervalTemplate from 'ui/agg_types/controls/interval.html';
diff --git a/src/ui/public/agg_types/buckets/range.js b/src/ui/public/agg_types/buckets/range.js
index 91c32da44f5b2..7bddefcf02513 100644
--- a/src/ui/public/agg_types/buckets/range.js
+++ b/src/ui/public/agg_types/buckets/range.js
@@ -1,8 +1,8 @@
import _ from 'lodash';
import AggTypesBucketsBucketAggTypeProvider from 'ui/agg_types/buckets/_bucket_agg_type';
import AggTypesBucketsCreateFilterRangeProvider from 'ui/agg_types/buckets/create_filter/range';
-import IndexPatternsFieldFormatFieldFormatProvider from 'ui/index_patterns/_field_format/FieldFormat';
-import RangeKeyProvider from './RangeKey';
+import IndexPatternsFieldFormatFieldFormatProvider from 'ui/index_patterns/_field_format/field_format';
+import RangeKeyProvider from './range_key';
import rangesTemplate from 'ui/agg_types/controls/ranges.html';
export default function RangeAggDefinition(Private) {
var BucketAggType = Private(AggTypesBucketsBucketAggTypeProvider);
diff --git a/src/ui/public/agg_types/buckets/RangeKey.js b/src/ui/public/agg_types/buckets/range_key.js
similarity index 100%
rename from src/ui/public/agg_types/buckets/RangeKey.js
rename to src/ui/public/agg_types/buckets/range_key.js
diff --git a/src/ui/public/agg_types/buckets/terms.js b/src/ui/public/agg_types/buckets/terms.js
index af59b91b94cc5..acc74d7cf2f46 100644
--- a/src/ui/public/agg_types/buckets/terms.js
+++ b/src/ui/public/agg_types/buckets/terms.js
@@ -1,8 +1,8 @@
import _ from 'lodash';
import AggTypesBucketsBucketAggTypeProvider from 'ui/agg_types/buckets/_bucket_agg_type';
import AggTypesBucketsBucketCountBetweenProvider from 'ui/agg_types/buckets/_bucket_count_between';
-import VisAggConfigProvider from 'ui/Vis/AggConfig';
-import VisSchemasProvider from 'ui/Vis/Schemas';
+import VisAggConfigProvider from 'ui/vis/agg_config';
+import VisSchemasProvider from 'ui/vis/schemas';
import AggTypesBucketsCreateFilterTermsProvider from 'ui/agg_types/buckets/create_filter/terms';
import orderAggTemplate from 'ui/agg_types/controls/order_agg.html';
import orderAndSizeTemplate from 'ui/agg_types/controls/order_and_size.html';
diff --git a/src/ui/public/agg_types/index.js b/src/ui/public/agg_types/index.js
index 0706370303098..dafc04b8245a7 100644
--- a/src/ui/public/agg_types/index.js
+++ b/src/ui/public/agg_types/index.js
@@ -1,12 +1,12 @@
-import IndexedArray from 'ui/IndexedArray';
-import 'ui/agg_types/AggParams';
+import IndexedArray from 'ui/indexed_array';
+import 'ui/agg_types/agg_params';
import AggTypesMetricsCountProvider from 'ui/agg_types/metrics/count';
import AggTypesMetricsAvgProvider from 'ui/agg_types/metrics/avg';
import AggTypesMetricsSumProvider from 'ui/agg_types/metrics/sum';
import AggTypesMetricsMedianProvider from 'ui/agg_types/metrics/median';
import AggTypesMetricsMinProvider from 'ui/agg_types/metrics/min';
import AggTypesMetricsMaxProvider from 'ui/agg_types/metrics/max';
-import AggTypesMetricsStdDeviationProvider from 'ui/agg_types/metrics/stdDeviation';
+import AggTypesMetricsStdDeviationProvider from 'ui/agg_types/metrics/std_deviation';
import AggTypesMetricsCardinalityProvider from 'ui/agg_types/metrics/cardinality';
import AggTypesMetricsPercentilesProvider from 'ui/agg_types/metrics/percentiles';
import AggTypesMetricsPercentileRanksProvider from 'ui/agg_types/metrics/percentile_ranks';
diff --git a/src/ui/public/agg_types/metrics/avg.js b/src/ui/public/agg_types/metrics/avg.js
index 970336f3019d2..e70c3b775408c 100644
--- a/src/ui/public/agg_types/metrics/avg.js
+++ b/src/ui/public/agg_types/metrics/avg.js
@@ -1,4 +1,4 @@
-import AggTypesMetricsMetricAggTypeProvider from 'ui/agg_types/metrics/MetricAggType';
+import AggTypesMetricsMetricAggTypeProvider from 'ui/agg_types/metrics/metric_agg_type';
export default function AggTypeMetricAvgProvider(Private) {
var MetricAggType = Private(AggTypesMetricsMetricAggTypeProvider);
diff --git a/src/ui/public/agg_types/metrics/cardinality.js b/src/ui/public/agg_types/metrics/cardinality.js
index a50100a4f165e..0cce5b7ab1be7 100644
--- a/src/ui/public/agg_types/metrics/cardinality.js
+++ b/src/ui/public/agg_types/metrics/cardinality.js
@@ -1,4 +1,4 @@
-import AggTypesMetricsMetricAggTypeProvider from 'ui/agg_types/metrics/MetricAggType';
+import AggTypesMetricsMetricAggTypeProvider from 'ui/agg_types/metrics/metric_agg_type';
import RegistryFieldFormatsProvider from 'ui/registry/field_formats';
export default function AggTypeMetricCardinalityProvider(Private) {
diff --git a/src/ui/public/agg_types/metrics/count.js b/src/ui/public/agg_types/metrics/count.js
index 571fe05fada34..ec9d2d37008f4 100644
--- a/src/ui/public/agg_types/metrics/count.js
+++ b/src/ui/public/agg_types/metrics/count.js
@@ -1,4 +1,4 @@
-import AggTypesMetricsMetricAggTypeProvider from 'ui/agg_types/metrics/MetricAggType';
+import AggTypesMetricsMetricAggTypeProvider from 'ui/agg_types/metrics/metric_agg_type';
import RegistryFieldFormatsProvider from 'ui/registry/field_formats';
export default function AggTypeMetricCountProvider(Private) {
diff --git a/src/ui/public/agg_types/metrics/getResponseAggConfigClass.js b/src/ui/public/agg_types/metrics/get_response_agg_config_class.js
similarity index 100%
rename from src/ui/public/agg_types/metrics/getResponseAggConfigClass.js
rename to src/ui/public/agg_types/metrics/get_response_agg_config_class.js
diff --git a/src/ui/public/agg_types/metrics/max.js b/src/ui/public/agg_types/metrics/max.js
index b40d95dc97355..70e893f0b869f 100644
--- a/src/ui/public/agg_types/metrics/max.js
+++ b/src/ui/public/agg_types/metrics/max.js
@@ -1,4 +1,4 @@
-import AggTypesMetricsMetricAggTypeProvider from 'ui/agg_types/metrics/MetricAggType';
+import AggTypesMetricsMetricAggTypeProvider from 'ui/agg_types/metrics/metric_agg_type';
export default function AggTypeMetricMaxProvider(Private) {
var MetricAggType = Private(AggTypesMetricsMetricAggTypeProvider);
diff --git a/src/ui/public/agg_types/metrics/median.js b/src/ui/public/agg_types/metrics/median.js
index c175e300f579d..1f6273e1def5b 100644
--- a/src/ui/public/agg_types/metrics/median.js
+++ b/src/ui/public/agg_types/metrics/median.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
-import AggTypesMetricsMetricAggTypeProvider from 'ui/agg_types/metrics/MetricAggType';
-import AggTypesMetricsGetResponseAggConfigClassProvider from 'ui/agg_types/metrics/getResponseAggConfigClass';
+import AggTypesMetricsMetricAggTypeProvider from 'ui/agg_types/metrics/metric_agg_type';
+import AggTypesMetricsGetResponseAggConfigClassProvider from 'ui/agg_types/metrics/get_response_agg_config_class';
import AggTypesMetricsPercentilesProvider from 'ui/agg_types/metrics/percentiles';
export default function AggTypeMetricMaxProvider(Private) {
var MetricAggType = Private(AggTypesMetricsMetricAggTypeProvider);
diff --git a/src/ui/public/agg_types/metrics/MetricAggType.js b/src/ui/public/agg_types/metrics/metric_agg_type.js
similarity index 96%
rename from src/ui/public/agg_types/metrics/MetricAggType.js
rename to src/ui/public/agg_types/metrics/metric_agg_type.js
index 7e3cfe4b177ca..1d435accefe35 100644
--- a/src/ui/public/agg_types/metrics/MetricAggType.js
+++ b/src/ui/public/agg_types/metrics/metric_agg_type.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import AggTypesAggTypeProvider from 'ui/agg_types/AggType';
+import AggTypesAggTypeProvider from 'ui/agg_types/agg_type';
import RegistryFieldFormatsProvider from 'ui/registry/field_formats';
export default function MetricAggTypeProvider(Private) {
var AggType = Private(AggTypesAggTypeProvider);
diff --git a/src/ui/public/agg_types/metrics/min.js b/src/ui/public/agg_types/metrics/min.js
index 4ab6242d48496..fd31dbd3dff58 100644
--- a/src/ui/public/agg_types/metrics/min.js
+++ b/src/ui/public/agg_types/metrics/min.js
@@ -1,4 +1,4 @@
-import AggTypesMetricsMetricAggTypeProvider from 'ui/agg_types/metrics/MetricAggType';
+import AggTypesMetricsMetricAggTypeProvider from 'ui/agg_types/metrics/metric_agg_type';
export default function AggTypeMetricMinProvider(Private) {
var MetricAggType = Private(AggTypesMetricsMetricAggTypeProvider);
diff --git a/src/ui/public/agg_types/metrics/percentile_ranks.js b/src/ui/public/agg_types/metrics/percentile_ranks.js
index 99802b8e71a0f..247a4f76ae074 100644
--- a/src/ui/public/agg_types/metrics/percentile_ranks.js
+++ b/src/ui/public/agg_types/metrics/percentile_ranks.js
@@ -1,8 +1,8 @@
import _ from 'lodash';
import valuesEditor from 'ui/agg_types/controls/percentile_ranks.html';
import 'ui/number_list';
-import AggTypesMetricsMetricAggTypeProvider from 'ui/agg_types/metrics/MetricAggType';
-import AggTypesMetricsGetResponseAggConfigClassProvider from 'ui/agg_types/metrics/getResponseAggConfigClass';
+import AggTypesMetricsMetricAggTypeProvider from 'ui/agg_types/metrics/metric_agg_type';
+import AggTypesMetricsGetResponseAggConfigClassProvider from 'ui/agg_types/metrics/get_response_agg_config_class';
import RegistryFieldFormatsProvider from 'ui/registry/field_formats';
export default function AggTypeMetricPercentileRanksProvider(Private) {
diff --git a/src/ui/public/agg_types/metrics/percentiles.js b/src/ui/public/agg_types/metrics/percentiles.js
index ecdb2b3629dff..09377032e5c0d 100644
--- a/src/ui/public/agg_types/metrics/percentiles.js
+++ b/src/ui/public/agg_types/metrics/percentiles.js
@@ -2,8 +2,8 @@ import _ from 'lodash';
import ordinalSuffix from 'ui/utils/ordinal_suffix';
import percentsEditor from 'ui/agg_types/controls/percentiles.html';
import 'ui/number_list';
-import AggTypesMetricsMetricAggTypeProvider from 'ui/agg_types/metrics/MetricAggType';
-import AggTypesMetricsGetResponseAggConfigClassProvider from 'ui/agg_types/metrics/getResponseAggConfigClass';
+import AggTypesMetricsMetricAggTypeProvider from 'ui/agg_types/metrics/metric_agg_type';
+import AggTypesMetricsGetResponseAggConfigClassProvider from 'ui/agg_types/metrics/get_response_agg_config_class';
import RegistryFieldFormatsProvider from 'ui/registry/field_formats';
export default function AggTypeMetricPercentilesProvider(Private) {
diff --git a/src/ui/public/agg_types/metrics/stdDeviation.js b/src/ui/public/agg_types/metrics/std_deviation.js
similarity index 95%
rename from src/ui/public/agg_types/metrics/stdDeviation.js
rename to src/ui/public/agg_types/metrics/std_deviation.js
index 1e31bbbf1d8d2..6a720bf83d1d1 100644
--- a/src/ui/public/agg_types/metrics/stdDeviation.js
+++ b/src/ui/public/agg_types/metrics/std_deviation.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
-import AggTypesMetricsMetricAggTypeProvider from 'ui/agg_types/metrics/MetricAggType';
-import AggTypesMetricsGetResponseAggConfigClassProvider from 'ui/agg_types/metrics/getResponseAggConfigClass';
+import AggTypesMetricsMetricAggTypeProvider from 'ui/agg_types/metrics/metric_agg_type';
+import AggTypesMetricsGetResponseAggConfigClassProvider from 'ui/agg_types/metrics/get_response_agg_config_class';
export default function AggTypeMetricStandardDeviationProvider(Private) {
var MetricAggType = Private(AggTypesMetricsMetricAggTypeProvider);
var getResponseAggConfigClass = Private(AggTypesMetricsGetResponseAggConfigClassProvider);
diff --git a/src/ui/public/agg_types/metrics/sum.js b/src/ui/public/agg_types/metrics/sum.js
index 8ba2e9407b3e8..cbdced241db10 100644
--- a/src/ui/public/agg_types/metrics/sum.js
+++ b/src/ui/public/agg_types/metrics/sum.js
@@ -1,4 +1,4 @@
-import AggTypesMetricsMetricAggTypeProvider from 'ui/agg_types/metrics/MetricAggType';
+import AggTypesMetricsMetricAggTypeProvider from 'ui/agg_types/metrics/metric_agg_type';
export default function AggTypeMetricSumProvider(Private) {
var MetricAggType = Private(AggTypesMetricsMetricAggTypeProvider);
diff --git a/src/ui/public/agg_types/param_types/optioned.js b/src/ui/public/agg_types/param_types/optioned.js
index 0a4b0297e4a66..646d7c103b555 100644
--- a/src/ui/public/agg_types/param_types/optioned.js
+++ b/src/ui/public/agg_types/param_types/optioned.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import IndexedArray from 'ui/IndexedArray';
+import IndexedArray from 'ui/indexed_array';
import AggTypesParamTypesBaseProvider from 'ui/agg_types/param_types/base';
export default function OptionedAggParamFactory(Private) {
diff --git a/src/ui/public/autoload/modules.js b/src/ui/public/autoload/modules.js
index af825a973179d..5919a14605474 100644
--- a/src/ui/public/autoload/modules.js
+++ b/src/ui/public/autoload/modules.js
@@ -25,11 +25,11 @@ import 'ui/state_management/app_state';
import 'ui/state_management/global_state';
import 'ui/storage';
import 'ui/stringify/register';
-import 'ui/styleCompile';
+import 'ui/style_compile';
import 'ui/timefilter';
import 'ui/timepicker';
import 'ui/tooltip';
import 'ui/typeahead';
import 'ui/url';
-import 'ui/validateDateInterval';
+import 'ui/validate_date_interval';
import 'ui/watch_multi';
diff --git a/src/ui/public/Binder/__tests__/Binder.js b/src/ui/public/binder/__tests__/binder.js
similarity index 98%
rename from src/ui/public/Binder/__tests__/Binder.js
rename to src/ui/public/binder/__tests__/binder.js
index d68119a73cb6d..1d283d8980f84 100644
--- a/src/ui/public/Binder/__tests__/Binder.js
+++ b/src/ui/public/binder/__tests__/binder.js
@@ -2,7 +2,7 @@ import sinon from 'auto-release-sinon';
import expect from 'expect.js';
import ngMock from 'ngMock';
-import Binder from 'ui/Binder';
+import Binder from 'ui/binder';
import $ from 'jquery';
describe('Binder class', function () {
diff --git a/src/ui/public/Binder/Binder.js b/src/ui/public/binder/binder.js
similarity index 100%
rename from src/ui/public/Binder/Binder.js
rename to src/ui/public/binder/binder.js
diff --git a/src/ui/public/chrome/__tests__/_TabFakeStore.js b/src/ui/public/chrome/__tests__/_tab_fake_store.js
similarity index 100%
rename from src/ui/public/chrome/__tests__/_TabFakeStore.js
rename to src/ui/public/chrome/__tests__/_tab_fake_store.js
diff --git a/src/ui/public/chrome/__tests__/Tab.js b/src/ui/public/chrome/__tests__/tab.js
similarity index 99%
rename from src/ui/public/chrome/__tests__/Tab.js
rename to src/ui/public/chrome/__tests__/tab.js
index 6f4b05adc402c..dcba69a356f94 100644
--- a/src/ui/public/chrome/__tests__/Tab.js
+++ b/src/ui/public/chrome/__tests__/tab.js
@@ -1,6 +1,6 @@
-import Tab from '../Tab';
+import Tab from '../tab';
import expect from 'expect.js';
-import TabFakeStore from './_TabFakeStore';
+import TabFakeStore from './_tab_fake_store';
describe('Chrome Tab', function () {
describe('construction', function () {
diff --git a/src/ui/public/chrome/__tests__/TabCollection.js b/src/ui/public/chrome/__tests__/tab_collection.js
similarity index 94%
rename from src/ui/public/chrome/__tests__/TabCollection.js
rename to src/ui/public/chrome/__tests__/tab_collection.js
index ffb2bc9597c4f..419e00a0fa321 100644
--- a/src/ui/public/chrome/__tests__/TabCollection.js
+++ b/src/ui/public/chrome/__tests__/tab_collection.js
@@ -1,8 +1,8 @@
import expect from 'expect.js';
-import TabFakeStore from './_TabFakeStore';
-import TabCollection from '../TabCollection';
-import Tab from '../Tab';
+import TabFakeStore from './_tab_fake_store';
+import TabCollection from '../tab_collection';
+import Tab from '../tab';
import { indexBy, random } from 'lodash';
describe('Chrome TabCollection', function () {
diff --git a/src/ui/public/chrome/api/__tests__/apps.js b/src/ui/public/chrome/api/__tests__/apps.js
index 059cc2a40d9ab..f0269e79c46d4 100644
--- a/src/ui/public/chrome/api/__tests__/apps.js
+++ b/src/ui/public/chrome/api/__tests__/apps.js
@@ -1,7 +1,7 @@
import expect from 'expect.js';
import setup from '../apps';
-import TabFakeStore from '../../__tests__/_TabFakeStore';
+import TabFakeStore from '../../__tests__/_tab_fake_store';
describe('Chrome API :: apps', function () {
describe('#get/setShowAppsLink()', function () {
diff --git a/src/ui/public/chrome/api/tabs.js b/src/ui/public/chrome/api/tabs.js
index 659b00eae30e4..97205ed597484 100644
--- a/src/ui/public/chrome/api/tabs.js
+++ b/src/ui/public/chrome/api/tabs.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import TabCollection from '../TabCollection';
+import TabCollection from '../tab_collection';
module.exports = function (chrome, internals) {
diff --git a/src/ui/public/chrome/context.js b/src/ui/public/chrome/context.js
index 72961f889701f..092ea422dcdff 100644
--- a/src/ui/public/chrome/context.js
+++ b/src/ui/public/chrome/context.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import ConfigTemplate from 'ui/ConfigTemplate';
+import ConfigTemplate from 'ui/config_template';
import uiModules from 'ui/modules';
uiModules
diff --git a/src/ui/public/chrome/directives/app_switcher/__tests__/app_switcher.js b/src/ui/public/chrome/directives/app_switcher/__tests__/app_switcher.js
index 57a5931f53e1a..1d56ff08462ad 100644
--- a/src/ui/public/chrome/directives/app_switcher/__tests__/app_switcher.js
+++ b/src/ui/public/chrome/directives/app_switcher/__tests__/app_switcher.js
@@ -2,7 +2,7 @@ import sinon from 'auto-release-sinon';
import ngMock from 'ngMock';
import expect from 'expect.js';
-import DomLocationProvider from 'ui/domLocation';
+import DomLocationProvider from 'ui/dom_location';
import { constant } from 'lodash';
import { set } from 'lodash';
import { cloneDeep } from 'lodash';
diff --git a/src/ui/public/chrome/directives/app_switcher/app_switcher.js b/src/ui/public/chrome/directives/app_switcher/app_switcher.js
index 77c8a4834adce..7853012e4dcd1 100644
--- a/src/ui/public/chrome/directives/app_switcher/app_switcher.js
+++ b/src/ui/public/chrome/directives/app_switcher/app_switcher.js
@@ -1,5 +1,5 @@
-import DomLocationProvider from 'ui/domLocation';
+import DomLocationProvider from 'ui/dom_location';
import { parse } from 'url';
import { bindKey } from 'lodash';
import '../app_switcher/app_switcher.less';
diff --git a/src/ui/public/chrome/directives/kbn_chrome.js b/src/ui/public/chrome/directives/kbn_chrome.js
index e06b373a3c15b..6b0f5789582c5 100644
--- a/src/ui/public/chrome/directives/kbn_chrome.js
+++ b/src/ui/public/chrome/directives/kbn_chrome.js
@@ -1,7 +1,7 @@
import $ from 'jquery';
import UiModules from 'ui/modules';
-import ConfigTemplate from 'ui/ConfigTemplate';
+import ConfigTemplate from 'ui/config_template';
export default function (chrome, internals) {
diff --git a/src/ui/public/chrome/Tab.js b/src/ui/public/chrome/tab.js
similarity index 100%
rename from src/ui/public/chrome/Tab.js
rename to src/ui/public/chrome/tab.js
diff --git a/src/ui/public/chrome/TabCollection.js b/src/ui/public/chrome/tab_collection.js
similarity index 97%
rename from src/ui/public/chrome/TabCollection.js
rename to src/ui/public/chrome/tab_collection.js
index 81ce9266ead93..d74e0104d33b2 100644
--- a/src/ui/public/chrome/TabCollection.js
+++ b/src/ui/public/chrome/tab_collection.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import Tab from 'ui/chrome/Tab';
+import Tab from 'ui/chrome/tab';
import { startsWith, get, set, omit, wrap, pick } from 'lodash';
import { parse } from 'url';
diff --git a/src/ui/public/ConfigTemplate.js b/src/ui/public/config_template.js
similarity index 100%
rename from src/ui/public/ConfigTemplate.js
rename to src/ui/public/config_template.js
diff --git a/src/ui/public/courier/__tests__/requestQueue.js b/src/ui/public/courier/__tests__/request_queue.js
similarity index 100%
rename from src/ui/public/courier/__tests__/requestQueue.js
rename to src/ui/public/courier/__tests__/request_queue.js
diff --git a/src/ui/public/courier/data_source/__tests__/DocSource.js b/src/ui/public/courier/data_source/__tests__/doc_source.js
similarity index 100%
rename from src/ui/public/courier/data_source/__tests__/DocSource.js
rename to src/ui/public/courier/data_source/__tests__/doc_source.js
diff --git a/src/ui/public/courier/data_source/__tests__/SearchSource.js b/src/ui/public/courier/data_source/__tests__/search_source.js
similarity index 100%
rename from src/ui/public/courier/data_source/__tests__/SearchSource.js
rename to src/ui/public/courier/data_source/__tests__/search_source.js
diff --git a/src/ui/public/directives/__tests__/fixedScroll.js b/src/ui/public/directives/__tests__/fixed_scroll.js
similarity index 99%
rename from src/ui/public/directives/__tests__/fixedScroll.js
rename to src/ui/public/directives/__tests__/fixed_scroll.js
index 7f8f7d51ab831..09d484d2e5a81 100644
--- a/src/ui/public/directives/__tests__/fixedScroll.js
+++ b/src/ui/public/directives/__tests__/fixed_scroll.js
@@ -1,7 +1,7 @@
import expect from 'expect.js';
import ngMock from 'ngMock';
-import 'ui/fixedScroll';
+import 'ui/fixed_scroll';
import $ from 'jquery';
import sinon from 'auto-release-sinon';
import Promise from 'bluebird';
diff --git a/src/ui/public/directives/config.js b/src/ui/public/directives/config.js
index b2ed2fc0e2226..7c0fda3aa197f 100644
--- a/src/ui/public/directives/config.js
+++ b/src/ui/public/directives/config.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
import 'ui/watch_multi';
-import ConfigTemplate from 'ui/ConfigTemplate';
+import ConfigTemplate from 'ui/config_template';
import angular from 'angular';
import 'ui/directives/input_focus';
import uiModules from 'ui/modules';
diff --git a/src/ui/public/directives/kbnSrc.js b/src/ui/public/directives/kbnSrc.js
deleted file mode 100644
index 93bbe6f776a0a..0000000000000
--- a/src/ui/public/directives/kbnSrc.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import { kbnUrlDirective } from './kbnHref';
-
-kbnUrlDirective('kbnSrc');
diff --git a/src/ui/public/directives/kbnHref.js b/src/ui/public/directives/kbn_href.js
similarity index 100%
rename from src/ui/public/directives/kbnHref.js
rename to src/ui/public/directives/kbn_href.js
diff --git a/src/ui/public/directives/kbn_src.js b/src/ui/public/directives/kbn_src.js
new file mode 100644
index 0000000000000..208ecf1144ac8
--- /dev/null
+++ b/src/ui/public/directives/kbn_src.js
@@ -0,0 +1,3 @@
+import { kbnUrlDirective } from './kbn_href';
+
+kbnUrlDirective('kbnSrc');
diff --git a/src/ui/public/directives/pretty_duration.js b/src/ui/public/directives/pretty_duration.js
index f1464e2cc8862..a463c215d1ab4 100644
--- a/src/ui/public/directives/pretty_duration.js
+++ b/src/ui/public/directives/pretty_duration.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import dateMath from 'ui/utils/dateMath';
+import dateMath from 'ui/utils/date_math';
import moment from 'moment';
import 'ui/timepicker/quick_ranges';
import 'ui/timepicker/time_units';
diff --git a/src/ui/public/directives/rows.js b/src/ui/public/directives/rows.js
index 38abec5cc1540..436bfb9830711 100644
--- a/src/ui/public/directives/rows.js
+++ b/src/ui/public/directives/rows.js
@@ -1,6 +1,6 @@
import $ from 'jquery';
import _ from 'lodash';
-import AggConfigResult from 'ui/Vis/AggConfigResult';
+import AggConfigResult from 'ui/vis/agg_config_result';
import FilterBarFilterBarClickHandlerProvider from 'ui/filter_bar/filter_bar_click_handler';
import uiModules from 'ui/modules';
var module = uiModules.get('kibana');
diff --git a/src/ui/public/directives/validate_cidr_mask.js b/src/ui/public/directives/validate_cidr_mask.js
index 52bc041b74a54..7288a9ec59dbe 100644
--- a/src/ui/public/directives/validate_cidr_mask.js
+++ b/src/ui/public/directives/validate_cidr_mask.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import CidrMask from 'ui/utils/CidrMask';
+import CidrMask from 'ui/utils/cidr_mask';
import uiModules from 'ui/modules';
uiModules.get('kibana').directive('validateCidrMask', function () {
diff --git a/src/ui/public/directives/validate_date_math.js b/src/ui/public/directives/validate_date_math.js
index 48e7ccc24b9c8..bfb4e437d4fc4 100644
--- a/src/ui/public/directives/validate_date_math.js
+++ b/src/ui/public/directives/validate_date_math.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import dateMath from 'ui/utils/dateMath';
+import dateMath from 'ui/utils/date_math';
import uiModules from 'ui/modules';
uiModules.get('kibana').directive('validateDateMath', function () {
diff --git a/src/ui/public/directives/validate_ip.js b/src/ui/public/directives/validate_ip.js
index adc0a263c79f1..9f12601288c99 100644
--- a/src/ui/public/directives/validate_ip.js
+++ b/src/ui/public/directives/validate_ip.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import Ipv4Address from 'ui/utils/Ipv4Address';
+import Ipv4Address from 'ui/utils/ipv4Address';
import uiModules from 'ui/modules';
uiModules
diff --git a/src/ui/public/domLocation.js b/src/ui/public/dom_location.js
similarity index 100%
rename from src/ui/public/domLocation.js
rename to src/ui/public/dom_location.js
diff --git a/src/ui/public/events.js b/src/ui/public/events.js
index 5bf1320829a09..f86946dcf61a9 100644
--- a/src/ui/public/events.js
+++ b/src/ui/public/events.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
import Notifier from 'ui/notify/notifier';
-import SimpleEmitter from 'ui/utils/SimpleEmitter';
+import SimpleEmitter from 'ui/utils/simple_emitter';
export default function EventsProvider(Private, Promise) {
var notify = new Notifier({ location: 'EventEmitter' });
diff --git a/src/ui/public/factories/__tests__/base_object.js b/src/ui/public/factories/__tests__/base_object.js
index 9f41d923dcc9d..d33f0cc220d96 100644
--- a/src/ui/public/factories/__tests__/base_object.js
+++ b/src/ui/public/factories/__tests__/base_object.js
@@ -12,7 +12,7 @@ describe('Base Object', function () {
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function (_$rootScope_, Private) {
$rootScope = _$rootScope_;
- BaseObject = require('ui/utils/BaseObject');
+ BaseObject = require('ui/utils/base_object');
}));
it('should take an inital set of values', function () {
diff --git a/src/ui/public/fancy_forms/fancy_forms.js b/src/ui/public/fancy_forms/fancy_forms.js
index c28adb50b8c97..1dd23015894dc 100644
--- a/src/ui/public/fancy_forms/fancy_forms.js
+++ b/src/ui/public/fancy_forms/fancy_forms.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
import $ from 'jquery';
-import KbnFormController from 'ui/fancy_forms/KbnFormController';
+import KbnFormController from 'ui/fancy_forms/kbn_form_controller';
import uiModules from 'ui/modules';
diff --git a/src/ui/public/fancy_forms/KbnFormController.js b/src/ui/public/fancy_forms/kbn_form_controller.js
similarity index 100%
rename from src/ui/public/fancy_forms/KbnFormController.js
rename to src/ui/public/fancy_forms/kbn_form_controller.js
diff --git a/src/ui/public/filter_bar/__tests__/_addFilters.js b/src/ui/public/filter_bar/__tests__/_add_filters.js
similarity index 100%
rename from src/ui/public/filter_bar/__tests__/_addFilters.js
rename to src/ui/public/filter_bar/__tests__/_add_filters.js
diff --git a/src/ui/public/filter_bar/__tests__/_getFilters.js b/src/ui/public/filter_bar/__tests__/_get_filters.js
similarity index 100%
rename from src/ui/public/filter_bar/__tests__/_getFilters.js
rename to src/ui/public/filter_bar/__tests__/_get_filters.js
diff --git a/src/ui/public/filter_bar/__tests__/_invertFilters.js b/src/ui/public/filter_bar/__tests__/_invert_filters.js
similarity index 100%
rename from src/ui/public/filter_bar/__tests__/_invertFilters.js
rename to src/ui/public/filter_bar/__tests__/_invert_filters.js
diff --git a/src/ui/public/filter_bar/__tests__/_pinFilters.js b/src/ui/public/filter_bar/__tests__/_pin_filters.js
similarity index 100%
rename from src/ui/public/filter_bar/__tests__/_pinFilters.js
rename to src/ui/public/filter_bar/__tests__/_pin_filters.js
diff --git a/src/ui/public/filter_bar/__tests__/_removeFilters.js b/src/ui/public/filter_bar/__tests__/_remove_filters.js
similarity index 100%
rename from src/ui/public/filter_bar/__tests__/_removeFilters.js
rename to src/ui/public/filter_bar/__tests__/_remove_filters.js
diff --git a/src/ui/public/filter_bar/__tests__/_toggleFilters.js b/src/ui/public/filter_bar/__tests__/_toggle_filters.js
similarity index 100%
rename from src/ui/public/filter_bar/__tests__/_toggleFilters.js
rename to src/ui/public/filter_bar/__tests__/_toggle_filters.js
diff --git a/src/ui/public/filter_bar/__tests__/_updateFilters.js b/src/ui/public/filter_bar/__tests__/_update_filters.js
similarity index 100%
rename from src/ui/public/filter_bar/__tests__/_updateFilters.js
rename to src/ui/public/filter_bar/__tests__/_update_filters.js
diff --git a/src/ui/public/filter_bar/__tests__/filter_bar.js b/src/ui/public/filter_bar/__tests__/filter_bar.js
index ea8977a806260..51a4fbcdbe89d 100644
--- a/src/ui/public/filter_bar/__tests__/filter_bar.js
+++ b/src/ui/public/filter_bar/__tests__/filter_bar.js
@@ -7,7 +7,7 @@ import sinon from 'sinon';
import MockState from 'fixtures/mock_state';
import $ from 'jquery';
import 'ui/filter_bar';
-import FilterBarLibMapFilterProvider from 'ui/filter_bar/lib/mapFilter';
+import FilterBarLibMapFilterProvider from 'ui/filter_bar/lib/map_filter';
import FilterBarQueryFilterProvider from 'ui/filter_bar/query_filter';
describe('Filter Bar Directive', function () {
diff --git a/src/ui/public/filter_bar/__tests__/query_filter.js b/src/ui/public/filter_bar/__tests__/query_filter.js
index b73631c65788f..4b973eb81a5c6 100644
--- a/src/ui/public/filter_bar/__tests__/query_filter.js
+++ b/src/ui/public/filter_bar/__tests__/query_filter.js
@@ -1,13 +1,13 @@
import _ from 'lodash';
import expect from 'expect.js';
import ngMock from 'ngMock';
-import './_getFilters';
-import './_addFilters';
-import './_removeFilters';
-import './_updateFilters';
-import './_toggleFilters';
-import './_invertFilters';
-import './_pinFilters';
+import './_get_filters';
+import './_add_filters';
+import './_remove_filters';
+import './_update_filters';
+import './_toggle_filters';
+import './_invert_filters';
+import './_pin_filters';
import FilterBarQueryFilterProvider from 'ui/filter_bar/query_filter';
import EventsProvider from 'ui/events';
var queryFilter;
diff --git a/src/ui/public/filter_bar/filter_bar.js b/src/ui/public/filter_bar/filter_bar.js
index 8953a8ae2be9f..d50a33d3b08e4 100644
--- a/src/ui/public/filter_bar/filter_bar.js
+++ b/src/ui/public/filter_bar/filter_bar.js
@@ -3,12 +3,12 @@ import template from 'ui/filter_bar/filter_bar.html';
import moment from 'moment';
import angular from 'angular';
import 'ui/directives/json_input';
-import filterAppliedAndUnwrap from 'ui/filter_bar/lib/filterAppliedAndUnwrap';
-import FilterBarLibMapAndFlattenFiltersProvider from 'ui/filter_bar/lib/mapAndFlattenFilters';
-import FilterBarLibMapFlattenAndWrapFiltersProvider from 'ui/filter_bar/lib/mapFlattenAndWrapFilters';
-import FilterBarLibExtractTimeFilterProvider from 'ui/filter_bar/lib/extractTimeFilter';
-import FilterBarLibFilterOutTimeBasedFilterProvider from 'ui/filter_bar/lib/filterOutTimeBasedFilter';
-import FilterBarLibChangeTimeFilterProvider from 'ui/filter_bar/lib/changeTimeFilter';
+import filterAppliedAndUnwrap from 'ui/filter_bar/lib/filter_applied_and_unwrap';
+import FilterBarLibMapAndFlattenFiltersProvider from 'ui/filter_bar/lib/map_and_flatten_filters';
+import FilterBarLibMapFlattenAndWrapFiltersProvider from 'ui/filter_bar/lib/map_flatten_and_wrap_filters';
+import FilterBarLibExtractTimeFilterProvider from 'ui/filter_bar/lib/extract_time_filter';
+import FilterBarLibFilterOutTimeBasedFilterProvider from 'ui/filter_bar/lib/filter_out_time_based_filter';
+import FilterBarLibChangeTimeFilterProvider from 'ui/filter_bar/lib/change_time_filter';
import FilterBarQueryFilterProvider from 'ui/filter_bar/query_filter';
import uiModules from 'ui/modules';
var module = uiModules.get('kibana');
diff --git a/src/ui/public/filter_bar/filter_bar_click_handler.js b/src/ui/public/filter_bar/filter_bar_click_handler.js
index ed254ba595763..8f2c7eb004a11 100644
--- a/src/ui/public/filter_bar/filter_bar_click_handler.js
+++ b/src/ui/public/filter_bar/filter_bar_click_handler.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
-import dedupFilters from './lib/dedupFilters';
-import uniqFilters from './lib/uniqFilters';
+import dedupFilters from './lib/dedup_filters';
+import uniqFilters from './lib/uniq_filters';
import findByParam from 'ui/utils/find_by_param';
export default function (Notifier) {
diff --git a/src/ui/public/filter_bar/lib/__tests__/changeTimeFilter.js b/src/ui/public/filter_bar/lib/__tests__/change_time_filter.js
similarity index 98%
rename from src/ui/public/filter_bar/lib/__tests__/changeTimeFilter.js
rename to src/ui/public/filter_bar/lib/__tests__/change_time_filter.js
index 93531a2be8334..543250d59b033 100644
--- a/src/ui/public/filter_bar/lib/__tests__/changeTimeFilter.js
+++ b/src/ui/public/filter_bar/lib/__tests__/change_time_filter.js
@@ -2,7 +2,7 @@
import moment from 'moment';
import ngMock from 'ngMock';
import expect from 'expect.js';
-import FilterBarLibChangeTimeFilterProvider from 'ui/filter_bar/lib/changeTimeFilter';
+import FilterBarLibChangeTimeFilterProvider from 'ui/filter_bar/lib/change_time_filter';
describe('Filter Bar Directive', function () {
describe('changeTimeFilter()', function () {
diff --git a/src/ui/public/filter_bar/lib/__tests__/dedupFilters.js b/src/ui/public/filter_bar/lib/__tests__/dedup_filters.js
similarity index 96%
rename from src/ui/public/filter_bar/lib/__tests__/dedupFilters.js
rename to src/ui/public/filter_bar/lib/__tests__/dedup_filters.js
index da54a30d576f7..a225fb824b176 100644
--- a/src/ui/public/filter_bar/lib/__tests__/dedupFilters.js
+++ b/src/ui/public/filter_bar/lib/__tests__/dedup_filters.js
@@ -1,4 +1,4 @@
-import dedupFilters from 'ui/filter_bar/lib/dedupFilters';
+import dedupFilters from 'ui/filter_bar/lib/dedup_filters';
import expect from 'expect.js';
describe('Filter Bar Directive', function () {
describe('dedupFilters(existing, filters)', function () {
diff --git a/src/ui/public/filter_bar/lib/__tests__/extractTimeFilter.js b/src/ui/public/filter_bar/lib/__tests__/extract_time_filter.js
similarity index 98%
rename from src/ui/public/filter_bar/lib/__tests__/extractTimeFilter.js
rename to src/ui/public/filter_bar/lib/__tests__/extract_time_filter.js
index 72af2d1408f88..746999ac5dd09 100644
--- a/src/ui/public/filter_bar/lib/__tests__/extractTimeFilter.js
+++ b/src/ui/public/filter_bar/lib/__tests__/extract_time_filter.js
@@ -1,7 +1,7 @@
import sinon from 'auto-release-sinon';
import expect from 'expect.js';
import ngMock from 'ngMock';
-import FilterBarLibExtractTimeFilterProvider from 'ui/filter_bar/lib/extractTimeFilter';
+import FilterBarLibExtractTimeFilterProvider from 'ui/filter_bar/lib/extract_time_filter';
describe('Filter Bar Directive', function () {
describe('extractTimeFilter()', function () {
diff --git a/src/ui/public/filter_bar/lib/__tests__/filterAppliedAndUnwrap.js b/src/ui/public/filter_bar/lib/__tests__/filter_applied_and_unwrap.js
similarity index 86%
rename from src/ui/public/filter_bar/lib/__tests__/filterAppliedAndUnwrap.js
rename to src/ui/public/filter_bar/lib/__tests__/filter_applied_and_unwrap.js
index c3b3c6edfde97..530a74b40baa8 100644
--- a/src/ui/public/filter_bar/lib/__tests__/filterAppliedAndUnwrap.js
+++ b/src/ui/public/filter_bar/lib/__tests__/filter_applied_and_unwrap.js
@@ -1,5 +1,5 @@
import expect from 'expect.js';
-import filterAppliedAndUnwrap from 'ui/filter_bar/lib/filterAppliedAndUnwrap';
+import filterAppliedAndUnwrap from 'ui/filter_bar/lib/filter_applied_and_unwrap';
describe('Filter Bar Directive', function () {
describe('filterAppliedAndUnwrap()', function () {
diff --git a/src/ui/public/filter_bar/lib/__tests__/filterOutTimeBasedFilter.js b/src/ui/public/filter_bar/lib/__tests__/filter_out_time_based_filter.js
similarity index 96%
rename from src/ui/public/filter_bar/lib/__tests__/filterOutTimeBasedFilter.js
rename to src/ui/public/filter_bar/lib/__tests__/filter_out_time_based_filter.js
index 7bd5eb25e755c..4400eda46122a 100644
--- a/src/ui/public/filter_bar/lib/__tests__/filterOutTimeBasedFilter.js
+++ b/src/ui/public/filter_bar/lib/__tests__/filter_out_time_based_filter.js
@@ -1,7 +1,7 @@
import expect from 'expect.js';
import ngMock from 'ngMock';
import sinon from 'auto-release-sinon';
-import FilterBarLibFilterOutTimeBasedFilterProvider from 'ui/filter_bar/lib/filterOutTimeBasedFilter';
+import FilterBarLibFilterOutTimeBasedFilterProvider from 'ui/filter_bar/lib/filter_out_time_based_filter';
describe('Filter Bar Directive', function () {
describe('filterOutTimeBasedFilter()', function () {
diff --git a/src/ui/public/filter_bar/lib/__tests__/generateMappingChain.js b/src/ui/public/filter_bar/lib/__tests__/generate_mapping_chain.js
similarity index 99%
rename from src/ui/public/filter_bar/lib/__tests__/generateMappingChain.js
rename to src/ui/public/filter_bar/lib/__tests__/generate_mapping_chain.js
index 50df4a1be7ca5..c1ec103a34374 100644
--- a/src/ui/public/filter_bar/lib/__tests__/generateMappingChain.js
+++ b/src/ui/public/filter_bar/lib/__tests__/generate_mapping_chain.js
@@ -1,7 +1,7 @@
import sinon from 'auto-release-sinon';
import expect from 'expect.js';
import ngMock from 'ngMock';
-import FilterBarLibGenerateMappingChainProvider from 'ui/filter_bar/lib/generateMappingChain';
+import FilterBarLibGenerateMappingChainProvider from 'ui/filter_bar/lib/generate_mapping_chain';
describe('Filter Bar Directive', function () {
describe('generateMappingChain()', function () {
diff --git a/src/ui/public/filter_bar/lib/__tests__/mapAndFlattenFilters.js b/src/ui/public/filter_bar/lib/__tests__/map_and_flatten_filters.js
similarity index 98%
rename from src/ui/public/filter_bar/lib/__tests__/mapAndFlattenFilters.js
rename to src/ui/public/filter_bar/lib/__tests__/map_and_flatten_filters.js
index 5b89292b6930a..13b2a1cac8a41 100644
--- a/src/ui/public/filter_bar/lib/__tests__/mapAndFlattenFilters.js
+++ b/src/ui/public/filter_bar/lib/__tests__/map_and_flatten_filters.js
@@ -1,7 +1,7 @@
import expect from 'expect.js';
import ngMock from 'ngMock';
import sinon from 'auto-release-sinon';
-import FilterBarLibMapAndFlattenFiltersProvider from 'ui/filter_bar/lib/mapAndFlattenFilters';
+import FilterBarLibMapAndFlattenFiltersProvider from 'ui/filter_bar/lib/map_and_flatten_filters';
describe('Filter Bar Directive', function () {
describe('mapAndFlattenFilters()', function () {
diff --git a/src/ui/public/filter_bar/lib/__tests__/mapDefault.js b/src/ui/public/filter_bar/lib/__tests__/map_default.js
similarity index 99%
rename from src/ui/public/filter_bar/lib/__tests__/mapDefault.js
rename to src/ui/public/filter_bar/lib/__tests__/map_default.js
index 1cc10f807434c..e3d51f0e60817 100644
--- a/src/ui/public/filter_bar/lib/__tests__/mapDefault.js
+++ b/src/ui/public/filter_bar/lib/__tests__/map_default.js
@@ -1,6 +1,6 @@
import expect from 'expect.js';
import ngMock from 'ngMock';
-import FilterBarLibMapDefaultProvider from 'ui/filter_bar/lib/mapDefault';
+import FilterBarLibMapDefaultProvider from 'ui/filter_bar/lib/map_default';
describe('Filter Bar Directive', function () {
describe('mapDefault()', function () {
diff --git a/src/ui/public/filter_bar/lib/__tests__/mapExists.js b/src/ui/public/filter_bar/lib/__tests__/map_exists.js
similarity index 99%
rename from src/ui/public/filter_bar/lib/__tests__/mapExists.js
rename to src/ui/public/filter_bar/lib/__tests__/map_exists.js
index 6a8c3edd46ea0..d5f496076ad91 100644
--- a/src/ui/public/filter_bar/lib/__tests__/mapExists.js
+++ b/src/ui/public/filter_bar/lib/__tests__/map_exists.js
@@ -1,6 +1,6 @@
import expect from 'expect.js';
import ngMock from 'ngMock';
-import FilterBarLibMapExistsProvider from 'ui/filter_bar/lib/mapExists';
+import FilterBarLibMapExistsProvider from 'ui/filter_bar/lib/map_exists';
describe('Filter Bar Directive', function () {
describe('mapExists()', function () {
diff --git a/src/ui/public/filter_bar/lib/__tests__/mapFilter.js b/src/ui/public/filter_bar/lib/__tests__/map_filter.js
similarity index 99%
rename from src/ui/public/filter_bar/lib/__tests__/mapFilter.js
rename to src/ui/public/filter_bar/lib/__tests__/map_filter.js
index e69f4ab1251f0..9c8e46a100671 100644
--- a/src/ui/public/filter_bar/lib/__tests__/mapFilter.js
+++ b/src/ui/public/filter_bar/lib/__tests__/map_filter.js
@@ -1,7 +1,7 @@
import sinon from 'auto-release-sinon';
import expect from 'expect.js';
import ngMock from 'ngMock';
-import FilterBarLibMapFilterProvider from 'ui/filter_bar/lib/mapFilter';
+import FilterBarLibMapFilterProvider from 'ui/filter_bar/lib/map_filter';
describe('Filter Bar Directive', function () {
var mapFilter;
diff --git a/src/ui/public/filter_bar/lib/__tests__/mapFlattenAndWrapFilters.js b/src/ui/public/filter_bar/lib/__tests__/map_flatten_and_wrap_filters.js
similarity index 97%
rename from src/ui/public/filter_bar/lib/__tests__/mapFlattenAndWrapFilters.js
rename to src/ui/public/filter_bar/lib/__tests__/map_flatten_and_wrap_filters.js
index 97bc0c3ba67e0..9f2ccc80fa835 100644
--- a/src/ui/public/filter_bar/lib/__tests__/mapFlattenAndWrapFilters.js
+++ b/src/ui/public/filter_bar/lib/__tests__/map_flatten_and_wrap_filters.js
@@ -3,7 +3,7 @@ import _ from 'lodash';
import sinon from 'auto-release-sinon';
import expect from 'expect.js';
import ngMock from 'ngMock';
-import FilterBarLibMapFlattenAndWrapFiltersProvider from 'ui/filter_bar/lib/mapFlattenAndWrapFilters';
+import FilterBarLibMapFlattenAndWrapFiltersProvider from 'ui/filter_bar/lib/map_flatten_and_wrap_filters';
describe('Filter Bar Directive', function () {
describe('mapFlattenAndWrapFilters()', function () {
var mapFlattenAndWrapFilters;
diff --git a/src/ui/public/filter_bar/lib/__tests__/mapGeoBoundingBox.js b/src/ui/public/filter_bar/lib/__tests__/map_geo_bounding_box.js
similarity index 98%
rename from src/ui/public/filter_bar/lib/__tests__/mapGeoBoundingBox.js
rename to src/ui/public/filter_bar/lib/__tests__/map_geo_bounding_box.js
index 30d3e1e8c5293..d586f4de6a72b 100644
--- a/src/ui/public/filter_bar/lib/__tests__/mapGeoBoundingBox.js
+++ b/src/ui/public/filter_bar/lib/__tests__/map_geo_bounding_box.js
@@ -1,7 +1,7 @@
import sinon from 'auto-release-sinon';
import expect from 'expect.js';
import ngMock from 'ngMock';
-import FilterBarLibMapGeoBoundingBoxProvider from 'ui/filter_bar/lib/mapGeoBoundingBox';
+import FilterBarLibMapGeoBoundingBoxProvider from 'ui/filter_bar/lib/map_geo_bounding_box';
describe('Filter Bar Directive', function () {
describe('mapGeoBoundingBox()', function () {
diff --git a/src/ui/public/filter_bar/lib/__tests__/mapMatchAll.js b/src/ui/public/filter_bar/lib/__tests__/map_match_all.js
similarity index 98%
rename from src/ui/public/filter_bar/lib/__tests__/mapMatchAll.js
rename to src/ui/public/filter_bar/lib/__tests__/map_match_all.js
index 3fcc107f38f7e..93911461918c7 100644
--- a/src/ui/public/filter_bar/lib/__tests__/mapMatchAll.js
+++ b/src/ui/public/filter_bar/lib/__tests__/map_match_all.js
@@ -1,6 +1,6 @@
import expect from 'expect.js';
import ngMock from 'ngMock';
-import FilterBarLibMapMatchAllProvider from 'ui/filter_bar/lib/mapMatchAll';
+import FilterBarLibMapMatchAllProvider from 'ui/filter_bar/lib/map_match_all';
describe('ui/filter_bar/lib', function () {
describe('mapMatchAll()', function () {
diff --git a/src/ui/public/filter_bar/lib/__tests__/mapMissing.js b/src/ui/public/filter_bar/lib/__tests__/map_missing.js
similarity index 98%
rename from src/ui/public/filter_bar/lib/__tests__/mapMissing.js
rename to src/ui/public/filter_bar/lib/__tests__/map_missing.js
index 721c1116398a3..0025cf289c389 100644
--- a/src/ui/public/filter_bar/lib/__tests__/mapMissing.js
+++ b/src/ui/public/filter_bar/lib/__tests__/map_missing.js
@@ -1,6 +1,6 @@
import ngMock from 'ngMock';
import expect from 'expect.js';
-import FilterBarLibMapMissingProvider from 'ui/filter_bar/lib/mapMissing';
+import FilterBarLibMapMissingProvider from 'ui/filter_bar/lib/map_missing';
describe('Filter Bar Directive', function () {
describe('mapMissing()', function () {
diff --git a/src/ui/public/filter_bar/lib/__tests__/mapQueryString.js b/src/ui/public/filter_bar/lib/__tests__/map_query_string.js
similarity index 98%
rename from src/ui/public/filter_bar/lib/__tests__/mapQueryString.js
rename to src/ui/public/filter_bar/lib/__tests__/map_query_string.js
index f4acd1eb3b9c4..b9b734190138e 100644
--- a/src/ui/public/filter_bar/lib/__tests__/mapQueryString.js
+++ b/src/ui/public/filter_bar/lib/__tests__/map_query_string.js
@@ -1,6 +1,6 @@
import expect from 'expect.js';
import ngMock from 'ngMock';
-import FilterBarLibMapQueryStringProvider from 'ui/filter_bar/lib/mapQueryString';
+import FilterBarLibMapQueryStringProvider from 'ui/filter_bar/lib/map_query_string';
describe('Filter Bar Directive', function () {
describe('mapQueryString()', function () {
var mapQueryString;
diff --git a/src/ui/public/filter_bar/lib/__tests__/mapRange.js b/src/ui/public/filter_bar/lib/__tests__/map_range.js
similarity index 96%
rename from src/ui/public/filter_bar/lib/__tests__/mapRange.js
rename to src/ui/public/filter_bar/lib/__tests__/map_range.js
index 3c4cb1484c8b7..83476e73c3809 100644
--- a/src/ui/public/filter_bar/lib/__tests__/mapRange.js
+++ b/src/ui/public/filter_bar/lib/__tests__/map_range.js
@@ -1,7 +1,7 @@
import sinon from 'auto-release-sinon';
import expect from 'expect.js';
import ngMock from 'ngMock';
-import FilterBarLibMapRangeProvider from 'ui/filter_bar/lib/mapRange';
+import FilterBarLibMapRangeProvider from 'ui/filter_bar/lib/map_range';
describe('Filter Bar Directive', function () {
describe('mapRange()', function () {
diff --git a/src/ui/public/filter_bar/lib/__tests__/mapScript.js b/src/ui/public/filter_bar/lib/__tests__/map_script.js
similarity index 99%
rename from src/ui/public/filter_bar/lib/__tests__/mapScript.js
rename to src/ui/public/filter_bar/lib/__tests__/map_script.js
index 3a7e2713aadca..b2eb81b5c6ce0 100644
--- a/src/ui/public/filter_bar/lib/__tests__/mapScript.js
+++ b/src/ui/public/filter_bar/lib/__tests__/map_script.js
@@ -1,7 +1,7 @@
import sinon from 'auto-release-sinon';
import expect from 'expect.js';
import ngMock from 'ngMock';
-import FilterBarLibMapScriptProvider from 'ui/filter_bar/lib/mapScript';
+import FilterBarLibMapScriptProvider from 'ui/filter_bar/lib/map_script';
describe('Filter Bar Directive', function () {
describe('mapScript()', function () {
diff --git a/src/ui/public/filter_bar/lib/__tests__/mapTerms.js b/src/ui/public/filter_bar/lib/__tests__/map_terms.js
similarity index 94%
rename from src/ui/public/filter_bar/lib/__tests__/mapTerms.js
rename to src/ui/public/filter_bar/lib/__tests__/map_terms.js
index 9bc0ab6737742..723fac7be4709 100644
--- a/src/ui/public/filter_bar/lib/__tests__/mapTerms.js
+++ b/src/ui/public/filter_bar/lib/__tests__/map_terms.js
@@ -1,7 +1,7 @@
import sinon from 'auto-release-sinon';
import expect from 'expect.js';
import ngMock from 'ngMock';
-import FilterBarLibMapTermsProvider from 'ui/filter_bar/lib/mapTerms';
+import FilterBarLibMapTermsProvider from 'ui/filter_bar/lib/map_terms';
describe('Filter Bar Directive', function () {
describe('mapTerms()', function () {
diff --git a/src/ui/public/filter_bar/lib/__tests__/onlyDisabled.js b/src/ui/public/filter_bar/lib/__tests__/only_disabled.js
similarity index 98%
rename from src/ui/public/filter_bar/lib/__tests__/onlyDisabled.js
rename to src/ui/public/filter_bar/lib/__tests__/only_disabled.js
index fc4bb030dae21..2ce365dab1eb9 100644
--- a/src/ui/public/filter_bar/lib/__tests__/onlyDisabled.js
+++ b/src/ui/public/filter_bar/lib/__tests__/only_disabled.js
@@ -1,4 +1,4 @@
-import onlyDisabled from 'ui/filter_bar/lib/onlyDisabled';
+import onlyDisabled from 'ui/filter_bar/lib/only_disabled';
import expect from 'expect.js';
describe('Filter Bar Directive', function () {
describe('onlyDisabled()', function () {
diff --git a/src/ui/public/filter_bar/lib/__tests__/uniqFilters.js b/src/ui/public/filter_bar/lib/__tests__/uniq_filters.js
similarity index 95%
rename from src/ui/public/filter_bar/lib/__tests__/uniqFilters.js
rename to src/ui/public/filter_bar/lib/__tests__/uniq_filters.js
index 90544df4e8b39..e6699f332f5f0 100644
--- a/src/ui/public/filter_bar/lib/__tests__/uniqFilters.js
+++ b/src/ui/public/filter_bar/lib/__tests__/uniq_filters.js
@@ -1,4 +1,4 @@
-import uniqFilters from 'ui/filter_bar/lib/uniqFilters';
+import uniqFilters from 'ui/filter_bar/lib/uniq_filters';
import expect from 'expect.js';
describe('Filter Bar Directive', function () {
describe('uniqFilter', function () {
diff --git a/src/ui/public/filter_bar/lib/changeTimeFilter.js b/src/ui/public/filter_bar/lib/change_time_filter.js
similarity index 100%
rename from src/ui/public/filter_bar/lib/changeTimeFilter.js
rename to src/ui/public/filter_bar/lib/change_time_filter.js
diff --git a/src/ui/public/filter_bar/lib/compareFilters.js b/src/ui/public/filter_bar/lib/compare_filters.js
similarity index 100%
rename from src/ui/public/filter_bar/lib/compareFilters.js
rename to src/ui/public/filter_bar/lib/compare_filters.js
diff --git a/src/ui/public/filter_bar/lib/dedupFilters.js b/src/ui/public/filter_bar/lib/dedup_filters.js
similarity index 91%
rename from src/ui/public/filter_bar/lib/dedupFilters.js
rename to src/ui/public/filter_bar/lib/dedup_filters.js
index 067f8cd95c19e..cfcc2ac91351e 100644
--- a/src/ui/public/filter_bar/lib/dedupFilters.js
+++ b/src/ui/public/filter_bar/lib/dedup_filters.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
import angular from 'angular';
-import compareFilters from 'ui/filter_bar/lib/compareFilters';
+import compareFilters from 'ui/filter_bar/lib/compare_filters';
/**
* Combine 2 filter collections, removing duplicates
diff --git a/src/ui/public/filter_bar/lib/extractTimeFilter.js b/src/ui/public/filter_bar/lib/extract_time_filter.js
similarity index 100%
rename from src/ui/public/filter_bar/lib/extractTimeFilter.js
rename to src/ui/public/filter_bar/lib/extract_time_filter.js
diff --git a/src/ui/public/filter_bar/lib/filterAppliedAndUnwrap.js b/src/ui/public/filter_bar/lib/filter_applied_and_unwrap.js
similarity index 100%
rename from src/ui/public/filter_bar/lib/filterAppliedAndUnwrap.js
rename to src/ui/public/filter_bar/lib/filter_applied_and_unwrap.js
diff --git a/src/ui/public/filter_bar/lib/filterOutTimeBasedFilter.js b/src/ui/public/filter_bar/lib/filter_out_time_based_filter.js
similarity index 100%
rename from src/ui/public/filter_bar/lib/filterOutTimeBasedFilter.js
rename to src/ui/public/filter_bar/lib/filter_out_time_based_filter.js
diff --git a/src/ui/public/filter_bar/lib/generateMappingChain.js b/src/ui/public/filter_bar/lib/generate_mapping_chain.js
similarity index 100%
rename from src/ui/public/filter_bar/lib/generateMappingChain.js
rename to src/ui/public/filter_bar/lib/generate_mapping_chain.js
diff --git a/src/ui/public/filter_bar/lib/mapAndFlattenFilters.js b/src/ui/public/filter_bar/lib/map_and_flatten_filters.js
similarity index 97%
rename from src/ui/public/filter_bar/lib/mapAndFlattenFilters.js
rename to src/ui/public/filter_bar/lib/map_and_flatten_filters.js
index 67b480dabc728..f8d2820cd0454 100644
--- a/src/ui/public/filter_bar/lib/mapAndFlattenFilters.js
+++ b/src/ui/public/filter_bar/lib/map_and_flatten_filters.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import FilterBarLibMapFilterProvider from 'ui/filter_bar/lib/mapFilter';
+import FilterBarLibMapFilterProvider from 'ui/filter_bar/lib/map_filter';
export default function mapAndFlattenFiltersProvider(Private, Promise) {
var mapFilter = Private(FilterBarLibMapFilterProvider);
return function (filters) {
diff --git a/src/ui/public/filter_bar/lib/mapDefault.js b/src/ui/public/filter_bar/lib/map_default.js
similarity index 100%
rename from src/ui/public/filter_bar/lib/mapDefault.js
rename to src/ui/public/filter_bar/lib/map_default.js
diff --git a/src/ui/public/filter_bar/lib/mapExists.js b/src/ui/public/filter_bar/lib/map_exists.js
similarity index 100%
rename from src/ui/public/filter_bar/lib/mapExists.js
rename to src/ui/public/filter_bar/lib/map_exists.js
diff --git a/src/ui/public/filter_bar/lib/mapFilter.js b/src/ui/public/filter_bar/lib/map_filter.js
similarity index 81%
rename from src/ui/public/filter_bar/lib/mapFilter.js
rename to src/ui/public/filter_bar/lib/map_filter.js
index dbb8fb514a389..79291f97b8442 100644
--- a/src/ui/public/filter_bar/lib/mapFilter.js
+++ b/src/ui/public/filter_bar/lib/map_filter.js
@@ -1,14 +1,14 @@
import _ from 'lodash';
-import GenerateMappingChainProvider from './generateMappingChain';
-import MapMatchAllProvider from './mapMatchAll';
-import MapTermsProvider from './mapTerms';
-import MapRangeProvider from './mapRange';
-import MapExistsProvider from './mapExists';
-import MapMissingProvider from './mapMissing';
-import MapQueryStringProvider from './mapQueryString';
-import MapGeoBoundingBoxProvider from './mapGeoBoundingBox';
-import MapScriptProvider from './mapScript';
-import MapDefaultProvider from './mapDefault';
+import GenerateMappingChainProvider from './generate_mapping_chain';
+import MapMatchAllProvider from './map_match_all';
+import MapTermsProvider from './map_terms';
+import MapRangeProvider from './map_range';
+import MapExistsProvider from './map_exists';
+import MapMissingProvider from './map_missing';
+import MapQueryStringProvider from './map_query_string';
+import MapGeoBoundingBoxProvider from './map_geo_bounding_box';
+import MapScriptProvider from './map_script';
+import MapDefaultProvider from './map_default';
export default function mapFilterProvider(Promise, Private) {
var generateMappingChain = Private(GenerateMappingChainProvider);
diff --git a/src/ui/public/filter_bar/lib/mapFlattenAndWrapFilters.js b/src/ui/public/filter_bar/lib/map_flatten_and_wrap_filters.js
similarity index 93%
rename from src/ui/public/filter_bar/lib/mapFlattenAndWrapFilters.js
rename to src/ui/public/filter_bar/lib/map_flatten_and_wrap_filters.js
index 22a315c28f24a..da726135aba64 100644
--- a/src/ui/public/filter_bar/lib/mapFlattenAndWrapFilters.js
+++ b/src/ui/public/filter_bar/lib/map_flatten_and_wrap_filters.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import FilterBarLibMapAndFlattenFiltersProvider from 'ui/filter_bar/lib/mapAndFlattenFilters';
+import FilterBarLibMapAndFlattenFiltersProvider from 'ui/filter_bar/lib/map_and_flatten_filters';
export default function mapFlattenAndWrapFilters(Private) {
var mapAndFlattenFilters = Private(FilterBarLibMapAndFlattenFiltersProvider);
return function (filters) {
diff --git a/src/ui/public/filter_bar/lib/mapGeoBoundingBox.js b/src/ui/public/filter_bar/lib/map_geo_bounding_box.js
similarity index 100%
rename from src/ui/public/filter_bar/lib/mapGeoBoundingBox.js
rename to src/ui/public/filter_bar/lib/map_geo_bounding_box.js
diff --git a/src/ui/public/filter_bar/lib/mapMatchAll.js b/src/ui/public/filter_bar/lib/map_match_all.js
similarity index 100%
rename from src/ui/public/filter_bar/lib/mapMatchAll.js
rename to src/ui/public/filter_bar/lib/map_match_all.js
diff --git a/src/ui/public/filter_bar/lib/mapMissing.js b/src/ui/public/filter_bar/lib/map_missing.js
similarity index 100%
rename from src/ui/public/filter_bar/lib/mapMissing.js
rename to src/ui/public/filter_bar/lib/map_missing.js
diff --git a/src/ui/public/filter_bar/lib/mapQueryString.js b/src/ui/public/filter_bar/lib/map_query_string.js
similarity index 100%
rename from src/ui/public/filter_bar/lib/mapQueryString.js
rename to src/ui/public/filter_bar/lib/map_query_string.js
diff --git a/src/ui/public/filter_bar/lib/mapRange.js b/src/ui/public/filter_bar/lib/map_range.js
similarity index 100%
rename from src/ui/public/filter_bar/lib/mapRange.js
rename to src/ui/public/filter_bar/lib/map_range.js
diff --git a/src/ui/public/filter_bar/lib/mapScript.js b/src/ui/public/filter_bar/lib/map_script.js
similarity index 100%
rename from src/ui/public/filter_bar/lib/mapScript.js
rename to src/ui/public/filter_bar/lib/map_script.js
diff --git a/src/ui/public/filter_bar/lib/mapTerms.js b/src/ui/public/filter_bar/lib/map_terms.js
similarity index 100%
rename from src/ui/public/filter_bar/lib/mapTerms.js
rename to src/ui/public/filter_bar/lib/map_terms.js
diff --git a/src/ui/public/filter_bar/lib/onlyDisabled.js b/src/ui/public/filter_bar/lib/only_disabled.js
similarity index 100%
rename from src/ui/public/filter_bar/lib/onlyDisabled.js
rename to src/ui/public/filter_bar/lib/only_disabled.js
diff --git a/src/ui/public/filter_bar/lib/onlyStateChanged.js b/src/ui/public/filter_bar/lib/only_state_changed.js
similarity index 87%
rename from src/ui/public/filter_bar/lib/onlyStateChanged.js
rename to src/ui/public/filter_bar/lib/only_state_changed.js
index 81cfa0807956f..2b3a7ad9723bd 100644
--- a/src/ui/public/filter_bar/lib/onlyStateChanged.js
+++ b/src/ui/public/filter_bar/lib/only_state_changed.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import compareFilters from 'ui/filter_bar/lib/compareFilters';
+import compareFilters from 'ui/filter_bar/lib/compare_filters';
var compareOptions = { disabled: true, negate: true };
/**
diff --git a/src/ui/public/filter_bar/lib/remapFilters.js b/src/ui/public/filter_bar/lib/remap_filters.js
similarity index 100%
rename from src/ui/public/filter_bar/lib/remapFilters.js
rename to src/ui/public/filter_bar/lib/remap_filters.js
diff --git a/src/ui/public/filter_bar/lib/uniqFilters.js b/src/ui/public/filter_bar/lib/uniq_filters.js
similarity index 88%
rename from src/ui/public/filter_bar/lib/uniqFilters.js
rename to src/ui/public/filter_bar/lib/uniq_filters.js
index 4de74305fa2ea..988f921af7b37 100644
--- a/src/ui/public/filter_bar/lib/uniqFilters.js
+++ b/src/ui/public/filter_bar/lib/uniq_filters.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import dedupFilters from 'ui/filter_bar/lib/dedupFilters';
+import dedupFilters from 'ui/filter_bar/lib/dedup_filters';
/**
* Remove duplicate filters from an array of filters
diff --git a/src/ui/public/filter_bar/query_filter.js b/src/ui/public/filter_bar/query_filter.js
index 79f549d1ee9c9..37557030d2011 100644
--- a/src/ui/public/filter_bar/query_filter.js
+++ b/src/ui/public/filter_bar/query_filter.js
@@ -1,11 +1,11 @@
import _ from 'lodash';
-import onlyDisabled from 'ui/filter_bar/lib/onlyDisabled';
-import onlyStateChanged from 'ui/filter_bar/lib/onlyStateChanged';
-import uniqFilters from 'ui/filter_bar/lib/uniqFilters';
-import compareFilters from 'ui/filter_bar/lib/compareFilters';
+import onlyDisabled from 'ui/filter_bar/lib/only_disabled';
+import onlyStateChanged from 'ui/filter_bar/lib/only_state_changed';
+import uniqFilters from 'ui/filter_bar/lib/uniq_filters';
+import compareFilters from 'ui/filter_bar/lib/compare_filters';
import angular from 'angular';
import EventsProvider from 'ui/events';
-import FilterBarLibMapAndFlattenFiltersProvider from 'ui/filter_bar/lib/mapAndFlattenFilters';
+import FilterBarLibMapAndFlattenFiltersProvider from 'ui/filter_bar/lib/map_and_flatten_filters';
export default function (Private, $rootScope, getAppState, globalState, config) {
var EventEmitter = Private(EventsProvider);
diff --git a/src/ui/public/filters/__tests__/commaList.js b/src/ui/public/filters/__tests__/comma_list.js
similarity index 96%
rename from src/ui/public/filters/__tests__/commaList.js
rename to src/ui/public/filters/__tests__/comma_list.js
index 761eaeaa0992b..b0a1e505f8087 100644
--- a/src/ui/public/filters/__tests__/commaList.js
+++ b/src/ui/public/filters/__tests__/comma_list.js
@@ -1,6 +1,6 @@
import expect from 'expect.js';
import ngMock from 'ngMock';
-import 'ui/filters/commaList';
+import 'ui/filters/comma_list';
describe('Comma-List filter', function () {
diff --git a/src/ui/public/filters/commaList.js b/src/ui/public/filters/comma_list.js
similarity index 100%
rename from src/ui/public/filters/commaList.js
rename to src/ui/public/filters/comma_list.js
diff --git a/src/ui/public/fixedScroll.js b/src/ui/public/fixed_scroll.js
similarity index 100%
rename from src/ui/public/fixedScroll.js
rename to src/ui/public/fixed_scroll.js
diff --git a/src/ui/public/index_patterns/__tests__/_FieldFormat.js b/src/ui/public/index_patterns/__tests__/_field_format.js
similarity index 99%
rename from src/ui/public/index_patterns/__tests__/_FieldFormat.js
rename to src/ui/public/index_patterns/__tests__/_field_format.js
index 26d5c9669f50c..cd8554e6230b6 100644
--- a/src/ui/public/index_patterns/__tests__/_FieldFormat.js
+++ b/src/ui/public/index_patterns/__tests__/_field_format.js
@@ -1,7 +1,7 @@
import _ from 'lodash';
import expect from 'expect.js';
import ngMock from 'ngMock';
-import IndexPatternsFieldFormatFieldFormatProvider from 'ui/index_patterns/_field_format/FieldFormat';
+import IndexPatternsFieldFormatFieldFormatProvider from 'ui/index_patterns/_field_format/field_format';
describe('FieldFormat class', function () {
var FieldFormat;
diff --git a/src/ui/public/index_patterns/__tests__/_index_pattern.js b/src/ui/public/index_patterns/__tests__/_index_pattern.js
index 79585e3728c1a..8003fcd6fd411 100644
--- a/src/ui/public/index_patterns/__tests__/_index_pattern.js
+++ b/src/ui/public/index_patterns/__tests__/_index_pattern.js
@@ -4,7 +4,7 @@ import ngMock from 'ngMock';
import expect from 'expect.js';
import Promise from 'bluebird';
import errors from 'ui/errors';
-import IndexedArray from 'ui/IndexedArray';
+import IndexedArray from 'ui/indexed_array';
import FixturesLogstashFieldsProvider from 'fixtures/logstash_fields';
import FixturesStubbedDocSourceResponseProvider from 'fixtures/stubbed_doc_source_response';
import CourierDataSourceDocSourceProvider from 'ui/courier/data_source/doc_source';
diff --git a/src/ui/public/index_patterns/__tests__/index.js b/src/ui/public/index_patterns/__tests__/index.js
index c0bdbcd4510ee..45e604d232556 100644
--- a/src/ui/public/index_patterns/__tests__/index.js
+++ b/src/ui/public/index_patterns/__tests__/index.js
@@ -3,6 +3,6 @@ import './_cast_mapping_type';
import './_map_field';
import './_pattern_to_wildcard';
import './_get_computed_fields';
-import './_FieldFormat';
+import './_field_format';
describe('Index Patterns', function () {
});
diff --git a/src/ui/public/index_patterns/_cast_mapping_type.js b/src/ui/public/index_patterns/_cast_mapping_type.js
index 1dd6cb6ca0adc..2445ab2442cdc 100644
--- a/src/ui/public/index_patterns/_cast_mapping_type.js
+++ b/src/ui/public/index_patterns/_cast_mapping_type.js
@@ -1,4 +1,4 @@
-import IndexedArray from 'ui/IndexedArray';
+import IndexedArray from 'ui/indexed_array';
export default function CastMappingTypeFn() {
castMappingType.types = new IndexedArray({
diff --git a/src/ui/public/index_patterns/_field.js b/src/ui/public/index_patterns/_field.js
index 5061703b9e099..d20b23625dff3 100644
--- a/src/ui/public/index_patterns/_field.js
+++ b/src/ui/public/index_patterns/_field.js
@@ -1,5 +1,5 @@
-import ObjDefine from 'ui/utils/ObjDefine';
-import IndexPatternsFieldFormatFieldFormatProvider from 'ui/index_patterns/_field_format/FieldFormat';
+import ObjDefine from 'ui/utils/obj_define';
+import IndexPatternsFieldFormatFieldFormatProvider from 'ui/index_patterns/_field_format/field_format';
import IndexPatternsFieldTypesProvider from 'ui/index_patterns/_field_types';
import RegistryFieldFormatsProvider from 'ui/registry/field_formats';
export default function FieldObjectProvider(Private, shortDotsFilter, $rootScope, Notifier) {
diff --git a/src/ui/public/index_patterns/_field_format/contentTypes.js b/src/ui/public/index_patterns/_field_format/content_types.js
similarity index 100%
rename from src/ui/public/index_patterns/_field_format/contentTypes.js
rename to src/ui/public/index_patterns/_field_format/content_types.js
diff --git a/src/ui/public/index_patterns/_field_format/FieldFormat.js b/src/ui/public/index_patterns/_field_format/field_format.js
similarity index 98%
rename from src/ui/public/index_patterns/_field_format/FieldFormat.js
rename to src/ui/public/index_patterns/_field_format/field_format.js
index de83ab8fef015..cca0fb1ef4741 100644
--- a/src/ui/public/index_patterns/_field_format/FieldFormat.js
+++ b/src/ui/public/index_patterns/_field_format/field_format.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import IndexPatternsFieldFormatContentTypesProvider from 'ui/index_patterns/_field_format/contentTypes';
+import IndexPatternsFieldFormatContentTypesProvider from 'ui/index_patterns/_field_format/content_types';
export default function FieldFormatClassProvider(config, $rootScope, Private) {
var contentTypes = Private(IndexPatternsFieldFormatContentTypesProvider);
diff --git a/src/ui/public/index_patterns/_field_list.js b/src/ui/public/index_patterns/_field_list.js
index efa5764b82a12..a55c27ad504ca 100644
--- a/src/ui/public/index_patterns/_field_list.js
+++ b/src/ui/public/index_patterns/_field_list.js
@@ -1,4 +1,4 @@
-import IndexedArray from 'ui/IndexedArray';
+import IndexedArray from 'ui/indexed_array';
import _ from 'lodash';
import IndexPatternsFieldProvider from 'ui/index_patterns/_field';
export default function FieldListProvider(Private) {
diff --git a/src/ui/public/index_patterns/_field_types.js b/src/ui/public/index_patterns/_field_types.js
index f61cafa881727..3ff7f290e5315 100644
--- a/src/ui/public/index_patterns/_field_types.js
+++ b/src/ui/public/index_patterns/_field_types.js
@@ -1,4 +1,4 @@
-import IndexedArray from 'ui/IndexedArray';
+import IndexedArray from 'ui/indexed_array';
export default function IndexPatternFieldTypes() {
return new IndexedArray({
diff --git a/src/ui/public/index_patterns/_intervals.js b/src/ui/public/index_patterns/_intervals.js
index 2910a2fa7f9c1..b43f060757fe5 100644
--- a/src/ui/public/index_patterns/_intervals.js
+++ b/src/ui/public/index_patterns/_intervals.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
import moment from 'moment';
-import IndexedArray from 'ui/IndexedArray';
+import IndexedArray from 'ui/indexed_array';
export default function IndexNameIntervalsService(timefilter) {
var intervals = new IndexedArray({
diff --git a/src/ui/public/index_patterns/routeSetup/loadDefault.js b/src/ui/public/index_patterns/route_setup/load_default.js
similarity index 100%
rename from src/ui/public/index_patterns/routeSetup/loadDefault.js
rename to src/ui/public/index_patterns/route_setup/load_default.js
diff --git a/src/ui/public/IndexedArray/__tests__/IndexedArray.js b/src/ui/public/indexed_array/__tests__/indexed_array.js
similarity index 98%
rename from src/ui/public/IndexedArray/__tests__/IndexedArray.js
rename to src/ui/public/indexed_array/__tests__/indexed_array.js
index 6cb9c662cb2d3..86cd496135845 100644
--- a/src/ui/public/IndexedArray/__tests__/IndexedArray.js
+++ b/src/ui/public/indexed_array/__tests__/indexed_array.js
@@ -1,7 +1,7 @@
import _ from 'lodash';
import expect from 'expect.js';
-import IndexedArray from 'ui/IndexedArray';
+import IndexedArray from 'ui/indexed_array';
// this is generally a data-structure that IndexedArray is good for managing
var users = [
diff --git a/src/ui/public/IndexedArray/__tests__/inflector.js b/src/ui/public/indexed_array/__tests__/inflector.js
similarity index 96%
rename from src/ui/public/IndexedArray/__tests__/inflector.js
rename to src/ui/public/indexed_array/__tests__/inflector.js
index 7178a952f4108..6af57d8ce99c1 100644
--- a/src/ui/public/IndexedArray/__tests__/inflector.js
+++ b/src/ui/public/indexed_array/__tests__/inflector.js
@@ -1,4 +1,4 @@
-import inflector from 'ui/IndexedArray/inflector';
+import inflector from 'ui/indexed_array/inflector';
import expect from 'expect.js';
describe('IndexedArray Inflector', function () {
diff --git a/src/ui/public/IndexedArray/IndexedArray.js b/src/ui/public/indexed_array/indexed_array.js
similarity index 98%
rename from src/ui/public/IndexedArray/IndexedArray.js
rename to src/ui/public/indexed_array/indexed_array.js
index c6cef5ef00717..c63d0b157528a 100644
--- a/src/ui/public/IndexedArray/IndexedArray.js
+++ b/src/ui/public/indexed_array/indexed_array.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import inflector from 'ui/IndexedArray/inflector';
+import inflector from 'ui/indexed_array/inflector';
var pathGetter = _(_.get).rearg(1, 0).ary(2);
diff --git a/src/ui/public/IndexedArray/inflector.js b/src/ui/public/indexed_array/inflector.js
similarity index 100%
rename from src/ui/public/IndexedArray/inflector.js
rename to src/ui/public/indexed_array/inflector.js
diff --git a/src/ui/public/jquery/__tests__/findTestSubject.js b/src/ui/public/jquery/__tests__/find_test_subject.js
similarity index 100%
rename from src/ui/public/jquery/__tests__/findTestSubject.js
rename to src/ui/public/jquery/__tests__/find_test_subject.js
diff --git a/src/ui/public/jquery/findTestSubject.js b/src/ui/public/jquery/find_test_subject.js
similarity index 100%
rename from src/ui/public/jquery/findTestSubject.js
rename to src/ui/public/jquery/find_test_subject.js
diff --git a/src/ui/public/notify/__tests__/Notifier_lib.js b/src/ui/public/notify/__tests__/notifier_lib.js
similarity index 100%
rename from src/ui/public/notify/__tests__/Notifier_lib.js
rename to src/ui/public/notify/__tests__/notifier_lib.js
diff --git a/src/ui/public/persisted_state/persisted_state.js b/src/ui/public/persisted_state/persisted_state.js
index a3f72d44342b3..f31636b326b5c 100644
--- a/src/ui/public/persisted_state/persisted_state.js
+++ b/src/ui/public/persisted_state/persisted_state.js
@@ -1,7 +1,7 @@
import _ from 'lodash';
import toPath from 'lodash/internal/toPath';
import errors from 'ui/errors';
-import SimpleEmitter from 'ui/utils/SimpleEmitter';
+import SimpleEmitter from 'ui/utils/simple_emitter';
import EventsProvider from 'ui/events';
export default function (Private) {
diff --git a/src/ui/public/registry/_registry.js b/src/ui/public/registry/_registry.js
index 43deb2f2e51cf..94c2bf6a3a96d 100644
--- a/src/ui/public/registry/_registry.js
+++ b/src/ui/public/registry/_registry.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import IndexedArray from 'ui/IndexedArray';
+import IndexedArray from 'ui/indexed_array';
import RegistryVisTypesProvider from 'ui/registry/vis_types';
var notPropsOptNames = IndexedArray.OPT_NAMES.concat('constructor');
diff --git a/src/ui/public/routes/__tests__/_RouteManager.js b/src/ui/public/routes/__tests__/_route_manager.js
similarity index 98%
rename from src/ui/public/routes/__tests__/_RouteManager.js
rename to src/ui/public/routes/__tests__/_route_manager.js
index a8636e3ccc569..a56a410500dcf 100644
--- a/src/ui/public/routes/__tests__/_RouteManager.js
+++ b/src/ui/public/routes/__tests__/_route_manager.js
@@ -1,7 +1,7 @@
import _ from 'lodash';
import ngMock from 'ngMock';
import sinon from 'auto-release-sinon';
-import RouteManager from 'ui/routes/RouteManager';
+import RouteManager from 'ui/routes/route_manager';
import expect from 'expect.js';
var routes; // will contain an new instance of RouteManager for each test
diff --git a/src/ui/public/routes/__tests__/_WorkQueue.js b/src/ui/public/routes/__tests__/_work_queue.js
similarity index 98%
rename from src/ui/public/routes/__tests__/_WorkQueue.js
rename to src/ui/public/routes/__tests__/_work_queue.js
index 984165a2e9f60..3afdc07df9c62 100644
--- a/src/ui/public/routes/__tests__/_WorkQueue.js
+++ b/src/ui/public/routes/__tests__/_work_queue.js
@@ -1,7 +1,7 @@
import _ from 'lodash';
import expect from 'expect.js';
import ngMock from 'ngMock';
-import WorkQueue from 'ui/routes/WorkQueue';
+import WorkQueue from 'ui/routes/work_queue';
import sinon from 'auto-release-sinon';
import 'ui/promises';
diff --git a/src/ui/public/routes/__tests__/_wrapRouteWithPrep.js b/src/ui/public/routes/__tests__/_wrap_route_with_prep.js
similarity index 95%
rename from src/ui/public/routes/__tests__/_wrapRouteWithPrep.js
rename to src/ui/public/routes/__tests__/_wrap_route_with_prep.js
index 647119d160e71..8218daae71cb9 100644
--- a/src/ui/public/routes/__tests__/_wrapRouteWithPrep.js
+++ b/src/ui/public/routes/__tests__/_wrap_route_with_prep.js
@@ -1,8 +1,8 @@
-import RouteManager from 'ui/routes/RouteManager';
+import RouteManager from 'ui/routes/route_manager';
import expect from 'expect.js';
import ngMock from 'ngMock';
-import wrapRouteWithPrep from 'ui/routes/wrapRouteWithPrep';
+import wrapRouteWithPrep from 'ui/routes/wrap_route_with_prep';
import Promise from 'bluebird';
import _ from 'lodash';
import { stub } from 'auto-release-sinon';
diff --git a/src/ui/public/routes/__tests__/index.js b/src/ui/public/routes/__tests__/index.js
index b9b5ea891e305..d51b5b6acb818 100644
--- a/src/ui/public/routes/__tests__/index.js
+++ b/src/ui/public/routes/__tests__/index.js
@@ -1,5 +1,5 @@
-import './_RouteManager';
-import './_WorkQueue';
-import './_wrapRouteWithPrep';
+import './_route_manager';
+import './_work_queue';
+import './_wrap_route_with_prep';
describe('Custom Route Management', function () {
});
diff --git a/src/ui/public/routes/RouteManager.js b/src/ui/public/routes/route_manager.js
similarity index 93%
rename from src/ui/public/routes/RouteManager.js
rename to src/ui/public/routes/route_manager.js
index 7ced036462cf9..df5ef1562ffbb 100644
--- a/src/ui/public/routes/RouteManager.js
+++ b/src/ui/public/routes/route_manager.js
@@ -1,7 +1,7 @@
import _ from 'lodash';
-import wrapRouteWithPrep from './wrapRouteWithPrep';
-import RouteSetupManager from './RouteSetupManager';
+import wrapRouteWithPrep from './wrap_route_with_prep';
+import RouteSetupManager from './route_setup_manager';
function RouteManager() {
var self = this;
diff --git a/src/ui/public/routes/RouteSetupManager.js b/src/ui/public/routes/route_setup_manager.js
similarity index 100%
rename from src/ui/public/routes/RouteSetupManager.js
rename to src/ui/public/routes/route_setup_manager.js
diff --git a/src/ui/public/routes/routes.js b/src/ui/public/routes/routes.js
index 7b5a929ba1cb9..7bdafc6b6930c 100644
--- a/src/ui/public/routes/routes.js
+++ b/src/ui/public/routes/routes.js
@@ -1,4 +1,4 @@
-import RouteManager from './RouteManager';
+import RouteManager from './route_manager';
import 'angular-route/angular-route';
import uiModules from 'ui/modules';
var defaultRouteManager = new RouteManager();
diff --git a/src/ui/public/routes/WorkQueue.js b/src/ui/public/routes/work_queue.js
similarity index 100%
rename from src/ui/public/routes/WorkQueue.js
rename to src/ui/public/routes/work_queue.js
diff --git a/src/ui/public/routes/wrapRouteWithPrep.js b/src/ui/public/routes/wrap_route_with_prep.js
similarity index 95%
rename from src/ui/public/routes/wrapRouteWithPrep.js
rename to src/ui/public/routes/wrap_route_with_prep.js
index 6674f139b45bd..e5156eb4df2c6 100644
--- a/src/ui/public/routes/wrapRouteWithPrep.js
+++ b/src/ui/public/routes/wrap_route_with_prep.js
@@ -1,6 +1,6 @@
import angular from 'angular';
import _ from 'lodash';
-import WorkQueue from 'ui/routes/WorkQueue';
+import WorkQueue from 'ui/routes/work_queue';
import errors from 'ui/errors';
diff --git a/src/ui/public/StackTraceMapper/setErrorStack.js b/src/ui/public/stack_trace_mapper/set_error_stack.js
similarity index 100%
rename from src/ui/public/StackTraceMapper/setErrorStack.js
rename to src/ui/public/stack_trace_mapper/set_error_stack.js
diff --git a/src/ui/public/StackTraceMapper/SourceMapReader.js b/src/ui/public/stack_trace_mapper/source_map_reader.js
similarity index 100%
rename from src/ui/public/StackTraceMapper/SourceMapReader.js
rename to src/ui/public/stack_trace_mapper/source_map_reader.js
diff --git a/src/ui/public/StackTraceMapper/stackLineFormat.js b/src/ui/public/stack_trace_mapper/stack_line_format.js
similarity index 100%
rename from src/ui/public/StackTraceMapper/stackLineFormat.js
rename to src/ui/public/stack_trace_mapper/stack_line_format.js
diff --git a/src/ui/public/StackTraceMapper/StackTraceMapper.js b/src/ui/public/stack_trace_mapper/stack_trace_mapper.js
similarity index 88%
rename from src/ui/public/StackTraceMapper/StackTraceMapper.js
rename to src/ui/public/stack_trace_mapper/stack_trace_mapper.js
index 99a54fc5dd2c6..fbf8fa05f29a1 100644
--- a/src/ui/public/StackTraceMapper/StackTraceMapper.js
+++ b/src/ui/public/stack_trace_mapper/stack_trace_mapper.js
@@ -1,10 +1,10 @@
import _ from 'lodash';
import fetch from 'exports?window.fetch!imports?Promise=bluebird!whatwg-fetch';
-import setErrorStack from './setErrorStack';
-import translateStackLine from './translateStackLine';
-import stackLineFormat from './stackLineFormat';
-import SourceMapReader from './SourceMapReader';
+import setErrorStack from './set_error_stack';
+import translateStackLine from './translate_stack_line';
+import stackLineFormat from './stack_line_format';
+import SourceMapReader from './source_map_reader';
import { resolve } from 'bluebird';
import $ from 'jquery';
diff --git a/src/ui/public/StackTraceMapper/translateStackLine.js b/src/ui/public/stack_trace_mapper/translate_stack_line.js
similarity index 100%
rename from src/ui/public/StackTraceMapper/translateStackLine.js
rename to src/ui/public/stack_trace_mapper/translate_stack_line.js
diff --git a/src/ui/public/stringify/__tests__/_conformance.js b/src/ui/public/stringify/__tests__/_conformance.js
index 6218e5a49c0e8..37af3a4e73447 100644
--- a/src/ui/public/stringify/__tests__/_conformance.js
+++ b/src/ui/public/stringify/__tests__/_conformance.js
@@ -2,7 +2,7 @@ import _ from 'lodash';
import expect from 'expect.js';
import ngMock from 'ngMock';
import RegistryFieldFormatsProvider from 'ui/registry/field_formats';
-import IndexPatternsFieldFormatFieldFormatProvider from 'ui/index_patterns/_field_format/FieldFormat';
+import IndexPatternsFieldFormatFieldFormatProvider from 'ui/index_patterns/_field_format/field_format';
var fieldFormats;
var FieldFormat;
diff --git a/src/ui/public/stringify/register.js b/src/ui/public/stringify/register.js
index b03389afc8c65..aad72585a37bd 100644
--- a/src/ui/public/stringify/register.js
+++ b/src/ui/public/stringify/register.js
@@ -1,13 +1,13 @@
import fieldFormats from 'ui/registry/field_formats';
-import stringifyUrl from 'ui/stringify/types/Url';
-import stringifyBytes from 'ui/stringify/types/Bytes';
-import stringifyDate from 'ui/stringify/types/Date';
-import stringifyIp from 'ui/stringify/types/Ip';
-import stringifyNumber from 'ui/stringify/types/Number';
-import stringifyPercent from 'ui/stringify/types/Percent';
-import stringifyString from 'ui/stringify/types/String';
-import stringifySource from 'ui/stringify/types/Source';
-import stringifyColor from 'ui/stringify/types/Color';
+import stringifyUrl from 'ui/stringify/types/url';
+import stringifyBytes from 'ui/stringify/types/bytes';
+import stringifyDate from 'ui/stringify/types/date';
+import stringifyIp from 'ui/stringify/types/ip';
+import stringifyNumber from 'ui/stringify/types/number';
+import stringifyPercent from 'ui/stringify/types/percent';
+import stringifyString from 'ui/stringify/types/string';
+import stringifySource from 'ui/stringify/types/source';
+import stringifyColor from 'ui/stringify/types/color';
import stringifyTruncate from 'ui/stringify/types/truncate';
fieldFormats.register(stringifyUrl);
fieldFormats.register(stringifyBytes);
diff --git a/src/ui/public/stringify/types/_Numeral.js b/src/ui/public/stringify/types/_numeral.js
similarity index 97%
rename from src/ui/public/stringify/types/_Numeral.js
rename to src/ui/public/stringify/types/_numeral.js
index 7769319d9d353..79eb233b81762 100644
--- a/src/ui/public/stringify/types/_Numeral.js
+++ b/src/ui/public/stringify/types/_numeral.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
import 'ui/field_format_editor/numeral/numeral';
-import IndexPatternsFieldFormatFieldFormatProvider from 'ui/index_patterns/_field_format/FieldFormat';
+import IndexPatternsFieldFormatFieldFormatProvider from 'ui/index_patterns/_field_format/field_format';
import BoundToConfigObjProvider from 'ui/bound_to_config_obj';
export default function AbstractNumeralFormatProvider(Private) {
var FieldFormat = Private(IndexPatternsFieldFormatFieldFormatProvider);
diff --git a/src/ui/public/stringify/types/Bytes.js b/src/ui/public/stringify/types/bytes.js
similarity index 78%
rename from src/ui/public/stringify/types/Bytes.js
rename to src/ui/public/stringify/types/bytes.js
index 97ab2809efbf4..d1fdcaf271ea7 100644
--- a/src/ui/public/stringify/types/Bytes.js
+++ b/src/ui/public/stringify/types/bytes.js
@@ -1,4 +1,4 @@
-import StringifyTypesNumeralProvider from 'ui/stringify/types/_Numeral';
+import StringifyTypesNumeralProvider from 'ui/stringify/types/_numeral';
export default function BytesFormatProvider(Private) {
var Numeral = Private(StringifyTypesNumeralProvider);
diff --git a/src/ui/public/stringify/types/Color.js b/src/ui/public/stringify/types/color.js
similarity index 97%
rename from src/ui/public/stringify/types/Color.js
rename to src/ui/public/stringify/types/color.js
index 645a94ef84ac0..adcd849f14a87 100644
--- a/src/ui/public/stringify/types/Color.js
+++ b/src/ui/public/stringify/types/color.js
@@ -1,6 +1,6 @@
import 'ui/stringify/editors/color.less';
import _ from 'lodash';
-import IndexPatternsFieldFormatFieldFormatProvider from 'ui/index_patterns/_field_format/FieldFormat';
+import IndexPatternsFieldFormatFieldFormatProvider from 'ui/index_patterns/_field_format/field_format';
import colorTemplate from 'ui/stringify/editors/color.html';
export default function _StringProvider(Private) {
diff --git a/src/ui/public/stringify/types/Date.js b/src/ui/public/stringify/types/date.js
similarity index 97%
rename from src/ui/public/stringify/types/Date.js
rename to src/ui/public/stringify/types/date.js
index 70ae1b3873f7e..194986a77a13f 100644
--- a/src/ui/public/stringify/types/Date.js
+++ b/src/ui/public/stringify/types/date.js
@@ -1,7 +1,7 @@
import _ from 'lodash';
import moment from 'moment';
import 'ui/field_format_editor/pattern/pattern';
-import IndexPatternsFieldFormatFieldFormatProvider from 'ui/index_patterns/_field_format/FieldFormat';
+import IndexPatternsFieldFormatFieldFormatProvider from 'ui/index_patterns/_field_format/field_format';
import BoundToConfigObjProvider from 'ui/bound_to_config_obj';
import dateTemplate from 'ui/stringify/editors/date.html';
export default function DateTimeFormatProvider(Private) {
diff --git a/src/ui/public/stringify/types/Ip.js b/src/ui/public/stringify/types/ip.js
similarity index 93%
rename from src/ui/public/stringify/types/Ip.js
rename to src/ui/public/stringify/types/ip.js
index b2e1d2bdf319d..6e5eb97f642e6 100644
--- a/src/ui/public/stringify/types/Ip.js
+++ b/src/ui/public/stringify/types/ip.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import IndexPatternsFieldFormatFieldFormatProvider from 'ui/index_patterns/_field_format/FieldFormat';
+import IndexPatternsFieldFormatFieldFormatProvider from 'ui/index_patterns/_field_format/field_format';
export default function IpFormatProvider(Private) {
var FieldFormat = Private(IndexPatternsFieldFormatFieldFormatProvider);
diff --git a/src/ui/public/stringify/types/Number.js b/src/ui/public/stringify/types/number.js
similarity index 80%
rename from src/ui/public/stringify/types/Number.js
rename to src/ui/public/stringify/types/number.js
index b59512994f92f..7ffd611b4137a 100644
--- a/src/ui/public/stringify/types/Number.js
+++ b/src/ui/public/stringify/types/number.js
@@ -1,4 +1,4 @@
-import StringifyTypesNumeralProvider from 'ui/stringify/types/_Numeral';
+import StringifyTypesNumeralProvider from 'ui/stringify/types/_numeral';
export default function NumberFormatProvider(Private) {
var Numeral = Private(StringifyTypesNumeralProvider);
diff --git a/src/ui/public/stringify/types/Percent.js b/src/ui/public/stringify/types/percent.js
similarity index 91%
rename from src/ui/public/stringify/types/Percent.js
rename to src/ui/public/stringify/types/percent.js
index 3709d0419f7bc..a87370bb0f1aa 100644
--- a/src/ui/public/stringify/types/Percent.js
+++ b/src/ui/public/stringify/types/percent.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
import BoundToConfigObjProvider from 'ui/bound_to_config_obj';
-import StringifyTypesNumeralProvider from 'ui/stringify/types/_Numeral';
+import StringifyTypesNumeralProvider from 'ui/stringify/types/_numeral';
export default function NumberFormatProvider(Private) {
var BoundToConfigObj = Private(BoundToConfigObjProvider);
var Numeral = Private(StringifyTypesNumeralProvider);
diff --git a/src/ui/public/stringify/types/Source.js b/src/ui/public/stringify/types/source.js
similarity index 97%
rename from src/ui/public/stringify/types/Source.js
rename to src/ui/public/stringify/types/source.js
index c874b2b483f8f..25cedc2b4f2b7 100644
--- a/src/ui/public/stringify/types/Source.js
+++ b/src/ui/public/stringify/types/source.js
@@ -1,7 +1,7 @@
import _ from 'lodash';
import noWhiteSpace from 'ui/utils/no_white_space';
import angular from 'angular';
-import IndexPatternsFieldFormatFieldFormatProvider from 'ui/index_patterns/_field_format/FieldFormat';
+import IndexPatternsFieldFormatFieldFormatProvider from 'ui/index_patterns/_field_format/field_format';
export default function _SourceProvider(Private, shortDotsFilter) {
var FieldFormat = Private(IndexPatternsFieldFormatFieldFormatProvider);
var template = _.template(noWhiteSpace(require('ui/stringify/types/_source.html')));
diff --git a/src/ui/public/stringify/types/String.js b/src/ui/public/stringify/types/string.js
similarity index 97%
rename from src/ui/public/stringify/types/String.js
rename to src/ui/public/stringify/types/string.js
index e5b11c918680f..94633e4979273 100644
--- a/src/ui/public/stringify/types/String.js
+++ b/src/ui/public/stringify/types/string.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
import 'ui/field_format_editor/samples/samples';
-import IndexPatternsFieldFormatFieldFormatProvider from 'ui/index_patterns/_field_format/FieldFormat';
+import IndexPatternsFieldFormatFieldFormatProvider from 'ui/index_patterns/_field_format/field_format';
export default function _StringProvider(Private) {
var FieldFormat = Private(IndexPatternsFieldFormatFieldFormatProvider);
diff --git a/src/ui/public/stringify/types/truncate.js b/src/ui/public/stringify/types/truncate.js
index 05d650dbe7a4d..bfa1396f2871d 100644
--- a/src/ui/public/stringify/types/truncate.js
+++ b/src/ui/public/stringify/types/truncate.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import IndexPatternsFieldFormatFieldFormatProvider from 'ui/index_patterns/_field_format/FieldFormat';
+import IndexPatternsFieldFormatFieldFormatProvider from 'ui/index_patterns/_field_format/field_format';
export default function TruncateFormatProvider(Private) {
var FieldFormat = Private(IndexPatternsFieldFormatFieldFormatProvider);
var omission = '...';
diff --git a/src/ui/public/stringify/types/Url.js b/src/ui/public/stringify/types/url.js
similarity index 98%
rename from src/ui/public/stringify/types/Url.js
rename to src/ui/public/stringify/types/url.js
index d8d6c01c2779a..4adac126caa2d 100644
--- a/src/ui/public/stringify/types/Url.js
+++ b/src/ui/public/stringify/types/url.js
@@ -1,7 +1,7 @@
import _ from 'lodash';
import 'ui/field_format_editor/pattern/pattern';
import 'ui/stringify/icons';
-import IndexPatternsFieldFormatFieldFormatProvider from 'ui/index_patterns/_field_format/FieldFormat';
+import IndexPatternsFieldFormatFieldFormatProvider from 'ui/index_patterns/_field_format/field_format';
import urlTemplate from 'ui/stringify/editors/url.html';
export default function UrlFormatProvider(Private, highlightFilter) {
diff --git a/src/ui/public/styleCompile/__tests__/styleCompile.js b/src/ui/public/style_compile/__tests__/style_compile.js
similarity index 100%
rename from src/ui/public/styleCompile/__tests__/styleCompile.js
rename to src/ui/public/style_compile/__tests__/style_compile.js
diff --git a/src/ui/public/styleCompile/styleCompile.css.tmpl b/src/ui/public/style_compile/style_compile.css.tmpl
similarity index 100%
rename from src/ui/public/styleCompile/styleCompile.css.tmpl
rename to src/ui/public/style_compile/style_compile.css.tmpl
diff --git a/src/ui/public/styleCompile/styleCompile.js b/src/ui/public/style_compile/style_compile.js
similarity index 92%
rename from src/ui/public/styleCompile/styleCompile.js
rename to src/ui/public/style_compile/style_compile.js
index 6d52d3f732d23..cebd9a8ee7e14 100644
--- a/src/ui/public/styleCompile/styleCompile.js
+++ b/src/ui/public/style_compile/style_compile.js
@@ -9,7 +9,7 @@ uiModules
.get('kibana')
.run(function ($rootScope, $compile, config) {
var truncateGradientHeight = 15;
- var template = _.template(require('./styleCompile.css.tmpl'));
+ var template = _.template(require('./style_compile.css.tmpl'));
var locals = {};
// watch the value of the truncate:maxHeight config param
diff --git a/src/ui/public/template_vis_type/TemplateRenderbot.js b/src/ui/public/template_vis_type/template_renderbot.js
similarity index 92%
rename from src/ui/public/template_vis_type/TemplateRenderbot.js
rename to src/ui/public/template_vis_type/template_renderbot.js
index 0b71c35c49b02..19040d61f3f13 100644
--- a/src/ui/public/template_vis_type/TemplateRenderbot.js
+++ b/src/ui/public/template_vis_type/template_renderbot.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import VisRenderbotProvider from 'ui/Vis/Renderbot';
+import VisRenderbotProvider from 'ui/vis/renderbot';
export default function TemplateRenderbotFactory(Private, $compile, $rootScope) {
var Renderbot = Private(VisRenderbotProvider);
diff --git a/src/ui/public/template_vis_type/TemplateVisType.js b/src/ui/public/template_vis_type/template_vis_type.js
similarity index 89%
rename from src/ui/public/template_vis_type/TemplateVisType.js
rename to src/ui/public/template_vis_type/template_vis_type.js
index 79461db1a984f..d9c7059e996ff 100644
--- a/src/ui/public/template_vis_type/TemplateVisType.js
+++ b/src/ui/public/template_vis_type/template_vis_type.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
-import VisVisTypeProvider from 'ui/Vis/VisType';
-import TemplateVisTypeTemplateRenderbotProvider from 'ui/template_vis_type/TemplateRenderbot';
+import VisVisTypeProvider from 'ui/vis/vis_type';
+import TemplateVisTypeTemplateRenderbotProvider from 'ui/template_vis_type/template_renderbot';
export default function TemplateVisTypeFactory(Private) {
var VisType = Private(VisVisTypeProvider);
var TemplateRenderbot = Private(TemplateVisTypeTemplateRenderbotProvider);
diff --git a/src/ui/public/testHarness/testHarness.js b/src/ui/public/test_harness/test_harness.js
similarity index 95%
rename from src/ui/public/testHarness/testHarness.js
rename to src/ui/public/test_harness/test_harness.js
index d1b3d79fabb23..4e898246c888d 100644
--- a/src/ui/public/testHarness/testHarness.js
+++ b/src/ui/public/test_harness/test_harness.js
@@ -7,10 +7,10 @@ import Nonsense from 'Nonsense';
import sinon from 'sinon';
import _ from 'lodash';
-import StackTraceMapper from 'ui/StackTraceMapper';
+import StackTraceMapper from 'ui/stack_trace_mapper';
import { parse } from 'url';
import $ from 'jquery';
-import './testHarness.less';
+import './test_harness.less';
import 'ngMock';
/*** the vislib tests have certain style requirements, so lets make sure they are met ***/
diff --git a/src/ui/public/testHarness/testHarness.less b/src/ui/public/test_harness/test_harness.less
similarity index 100%
rename from src/ui/public/testHarness/testHarness.less
rename to src/ui/public/test_harness/test_harness.less
diff --git a/src/ui/public/time_buckets/calc_es_interval.js b/src/ui/public/time_buckets/calc_es_interval.js
index e0df417897f02..a359926d84a5b 100644
--- a/src/ui/public/time_buckets/calc_es_interval.js
+++ b/src/ui/public/time_buckets/calc_es_interval.js
@@ -1,5 +1,5 @@
import moment from 'moment';
-import dateMath from 'ui/utils/dateMath';
+import dateMath from 'ui/utils/date_math';
export default function () {
var unitsDesc = dateMath.unitsDesc;
diff --git a/src/ui/public/time_buckets/time_buckets.js b/src/ui/public/time_buckets/time_buckets.js
index 22f7d0246cb48..2fb604cfa519e 100644
--- a/src/ui/public/time_buckets/time_buckets.js
+++ b/src/ui/public/time_buckets/time_buckets.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
import moment from 'moment';
-import dateMath from 'ui/utils/dateMath';
+import dateMath from 'ui/utils/date_math';
import parseInterval from 'ui/utils/parse_interval';
import TimeBucketsCalcAutoIntervalProvider from 'ui/time_buckets/calc_auto_interval';
import TimeBucketsCalcEsIntervalProvider from 'ui/time_buckets/calc_es_interval';
diff --git a/src/ui/public/timefilter/timefilter.js b/src/ui/public/timefilter/timefilter.js
index 02612f5ae7712..6573b82d90cf2 100644
--- a/src/ui/public/timefilter/timefilter.js
+++ b/src/ui/public/timefilter/timefilter.js
@@ -1,7 +1,7 @@
import _ from 'lodash';
import angular from 'angular';
import moment from 'moment';
-import dateMath from 'ui/utils/dateMath';
+import dateMath from 'ui/utils/date_math';
import 'ui/state_management/global_state';
import 'ui/config';
import EventsProvider from 'ui/events';
diff --git a/src/ui/public/timepicker/timepicker.js b/src/ui/public/timepicker/timepicker.js
index 63e087c365c18..6acde3837e6db 100644
--- a/src/ui/public/timepicker/timepicker.js
+++ b/src/ui/public/timepicker/timepicker.js
@@ -1,6 +1,6 @@
import html from 'ui/timepicker/timepicker.html';
import _ from 'lodash';
-import dateMath from 'ui/utils/dateMath';
+import dateMath from 'ui/utils/date_math';
import moment from 'moment';
import Notifier from 'ui/notify/notifier';
import 'ui/directives/input_datetime';
diff --git a/src/ui/public/utils/__tests__/cidr_mask.js b/src/ui/public/utils/__tests__/cidr_mask.js
index ef64b2aa08ead..ccc65824258d7 100644
--- a/src/ui/public/utils/__tests__/cidr_mask.js
+++ b/src/ui/public/utils/__tests__/cidr_mask.js
@@ -1,5 +1,5 @@
-import CidrMask from 'ui/utils/CidrMask';
+import CidrMask from 'ui/utils/cidr_mask';
import expect from 'expect.js';
describe('CidrMask', function () {
diff --git a/src/ui/public/utils/__tests__/datemath.js b/src/ui/public/utils/__tests__/datemath.js
index 984288554bee7..80b190ba68726 100644
--- a/src/ui/public/utils/__tests__/datemath.js
+++ b/src/ui/public/utils/__tests__/datemath.js
@@ -1,4 +1,4 @@
-import dateMath from 'ui/utils/dateMath';
+import dateMath from 'ui/utils/date_math';
import expect from 'expect.js';
import moment from 'moment';
import _ from 'lodash';
diff --git a/src/ui/public/utils/__tests__/Ipv4Address.js b/src/ui/public/utils/__tests__/ipv4Address.js
similarity index 97%
rename from src/ui/public/utils/__tests__/Ipv4Address.js
rename to src/ui/public/utils/__tests__/ipv4Address.js
index 4fb50b4a81f96..b263fca311e29 100644
--- a/src/ui/public/utils/__tests__/Ipv4Address.js
+++ b/src/ui/public/utils/__tests__/ipv4Address.js
@@ -1,4 +1,4 @@
-import Ipv4Address from 'ui/utils/Ipv4Address';
+import Ipv4Address from 'ui/utils/ipv4Address';
import expect from 'expect.js';
describe('Ipv4Address', function () {
diff --git a/src/ui/public/utils/__tests__/ObjDefine.js b/src/ui/public/utils/__tests__/obj_define.js
similarity index 98%
rename from src/ui/public/utils/__tests__/ObjDefine.js
rename to src/ui/public/utils/__tests__/obj_define.js
index bfdaa6ca4efda..0e5f5d1952333 100644
--- a/src/ui/public/utils/__tests__/ObjDefine.js
+++ b/src/ui/public/utils/__tests__/obj_define.js
@@ -1,5 +1,5 @@
import expect from 'expect.js';
-import ObjDefine from 'ui/utils/ObjDefine';
+import ObjDefine from 'ui/utils/obj_define';
describe('ObjDefine Utility', function () {
diff --git a/src/ui/public/utils/__tests__/SimpleEmitter.js b/src/ui/public/utils/__tests__/simple_emitter.js
similarity index 98%
rename from src/ui/public/utils/__tests__/SimpleEmitter.js
rename to src/ui/public/utils/__tests__/simple_emitter.js
index 3f9e4f294fcc7..3c4ebcc9022d7 100644
--- a/src/ui/public/utils/__tests__/SimpleEmitter.js
+++ b/src/ui/public/utils/__tests__/simple_emitter.js
@@ -1,4 +1,4 @@
-import SimpleEmitter from 'ui/utils/SimpleEmitter';
+import SimpleEmitter from 'ui/utils/simple_emitter';
import expect from 'expect.js';
import sinon from 'auto-release-sinon';
describe('SimpleEmitter class', function () {
diff --git a/src/ui/public/utils/BaseObject.js b/src/ui/public/utils/base_object.js
similarity index 100%
rename from src/ui/public/utils/BaseObject.js
rename to src/ui/public/utils/base_object.js
diff --git a/src/ui/public/utils/CidrMask.js b/src/ui/public/utils/cidr_mask.js
similarity index 95%
rename from src/ui/public/utils/CidrMask.js
rename to src/ui/public/utils/cidr_mask.js
index e43f20a4cc2a6..db6f62b677b21 100644
--- a/src/ui/public/utils/CidrMask.js
+++ b/src/ui/public/utils/cidr_mask.js
@@ -1,4 +1,4 @@
-import Ipv4Address from 'ui/utils/Ipv4Address';
+import Ipv4Address from 'ui/utils/ipv4Address';
var NUM_BITS = 32;
function throwError(mask) {
diff --git a/src/ui/public/utils/dateMath.js b/src/ui/public/utils/date_math.js
similarity index 100%
rename from src/ui/public/utils/dateMath.js
rename to src/ui/public/utils/date_math.js
diff --git a/src/ui/public/utils/esBool.js b/src/ui/public/utils/es_bool.js
similarity index 100%
rename from src/ui/public/utils/esBool.js
rename to src/ui/public/utils/es_bool.js
diff --git a/src/ui/public/utils/Ipv4Address.js b/src/ui/public/utils/ipv4Address.js
similarity index 100%
rename from src/ui/public/utils/Ipv4Address.js
rename to src/ui/public/utils/ipv4Address.js
diff --git a/src/ui/public/utils/ObjDefine.js b/src/ui/public/utils/obj_define.js
similarity index 100%
rename from src/ui/public/utils/ObjDefine.js
rename to src/ui/public/utils/obj_define.js
diff --git a/src/ui/public/utils/parse_interval.js b/src/ui/public/utils/parse_interval.js
index 2ccfcf3900f89..1f46eaf6a33bf 100644
--- a/src/ui/public/utils/parse_interval.js
+++ b/src/ui/public/utils/parse_interval.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
import moment from 'moment';
-import dateMath from 'ui/utils/dateMath';
+import dateMath from 'ui/utils/date_math';
// Assume interval is in the form (value)(unit), such as "1h"
var INTERVAL_STRING_RE = new RegExp('^([0-9\\.]*)\\s*(' + dateMath.units.join('|') + ')$');
diff --git a/src/ui/public/utils/SimpleEmitter.js b/src/ui/public/utils/simple_emitter.js
similarity index 98%
rename from src/ui/public/utils/SimpleEmitter.js
rename to src/ui/public/utils/simple_emitter.js
index 9fd35496104e0..20cc5569b8a8b 100644
--- a/src/ui/public/utils/SimpleEmitter.js
+++ b/src/ui/public/utils/simple_emitter.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import BaseObject from 'ui/utils/BaseObject';
+import BaseObject from 'ui/utils/base_object';
/**
* Simple event emitter class used in the vislib. Calls
diff --git a/src/ui/public/validateDateInterval.js b/src/ui/public/validate_date_interval.js
similarity index 100%
rename from src/ui/public/validateDateInterval.js
rename to src/ui/public/validate_date_interval.js
diff --git a/src/ui/public/Vis/__tests__/_AggConfig.js b/src/ui/public/vis/__tests__/_agg_config.js
similarity index 98%
rename from src/ui/public/Vis/__tests__/_AggConfig.js
rename to src/ui/public/vis/__tests__/_agg_config.js
index 1922242338ad8..7b9545580bb9d 100644
--- a/src/ui/public/Vis/__tests__/_AggConfig.js
+++ b/src/ui/public/vis/__tests__/_agg_config.js
@@ -1,9 +1,9 @@
import sinon from 'auto-release-sinon';
import expect from 'expect.js';
import ngMock from 'ngMock';
-import VisProvider from 'ui/Vis';
-import AggTypesAggTypeProvider from 'ui/agg_types/AggType';
-import VisAggConfigProvider from 'ui/Vis/AggConfig';
+import VisProvider from 'ui/vis';
+import AggTypesAggTypeProvider from 'ui/agg_types/agg_type';
+import VisAggConfigProvider from 'ui/vis/agg_config';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
import RegistryFieldFormatsProvider from 'ui/registry/field_formats';
describe('AggConfig', function () {
diff --git a/src/ui/public/Vis/__tests__/_AggConfigResult.js b/src/ui/public/vis/__tests__/_agg_config_result.js
similarity index 96%
rename from src/ui/public/Vis/__tests__/_AggConfigResult.js
rename to src/ui/public/vis/__tests__/_agg_config_result.js
index d63c19fab25d6..be56aa0de98d6 100644
--- a/src/ui/public/Vis/__tests__/_AggConfigResult.js
+++ b/src/ui/public/vis/__tests__/_agg_config_result.js
@@ -1,9 +1,9 @@
import _ from 'lodash';
-import AggConfigResult from 'ui/Vis/AggConfigResult';
+import AggConfigResult from 'ui/vis/agg_config_result';
import expect from 'expect.js';
import ngMock from 'ngMock';
-import VisProvider from 'ui/Vis';
-import VisAggConfigProvider from 'ui/Vis/AggConfig';
+import VisProvider from 'ui/vis';
+import VisAggConfigProvider from 'ui/vis/agg_config';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
describe('AggConfigResult', function () {
diff --git a/src/ui/public/Vis/__tests__/_AggConfigs.js b/src/ui/public/vis/__tests__/_agg_configs.js
similarity index 97%
rename from src/ui/public/Vis/__tests__/_AggConfigs.js
rename to src/ui/public/vis/__tests__/_agg_configs.js
index 3bb2e6c576cf5..ee09a3f3bd3c3 100644
--- a/src/ui/public/Vis/__tests__/_AggConfigs.js
+++ b/src/ui/public/vis/__tests__/_agg_configs.js
@@ -2,12 +2,12 @@ import _ from 'lodash';
import sinon from 'auto-release-sinon';
import expect from 'expect.js';
import ngMock from 'ngMock';
-import RealAggConfigPM from 'ui/Vis/AggConfig';
-import VisProvider from 'ui/Vis';
-import VisAggConfigProvider from 'ui/Vis/AggConfig';
-import VisAggConfigsProvider from 'ui/Vis/AggConfigs';
+import RealAggConfigPM from 'ui/vis/agg_config';
+import VisProvider from 'ui/vis';
+import VisAggConfigProvider from 'ui/vis/agg_config';
+import VisAggConfigsProvider from 'ui/vis/agg_configs';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
-import VisSchemasProvider from 'ui/Vis/Schemas';
+import VisSchemasProvider from 'ui/vis/schemas';
describe('AggConfigs', function () {
var Vis;
@@ -34,7 +34,7 @@ describe('AggConfigs', function () {
Vis = Private(VisProvider);
SpiedAggConfig = Private(VisAggConfigProvider);
AggConfigs = Private(VisAggConfigsProvider);
- IndexedArray = require('ui/IndexedArray');
+ IndexedArray = require('ui/indexed_array');
indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
Schemas = Private(VisSchemasProvider);
}));
diff --git a/src/ui/public/Vis/__tests__/_Renderbot.js b/src/ui/public/vis/__tests__/_renderbot.js
similarity index 94%
rename from src/ui/public/Vis/__tests__/_Renderbot.js
rename to src/ui/public/vis/__tests__/_renderbot.js
index e92317af6159f..4645e840a4292 100644
--- a/src/ui/public/Vis/__tests__/_Renderbot.js
+++ b/src/ui/public/vis/__tests__/_renderbot.js
@@ -1,6 +1,6 @@
import expect from 'expect.js';
import ngMock from 'ngMock';
-import VisRenderbotProvider from 'ui/Vis/Renderbot';
+import VisRenderbotProvider from 'ui/vis/renderbot';
describe('renderbot', function () {
var Renderbot;
diff --git a/src/ui/public/Vis/__tests__/_Vis.js b/src/ui/public/vis/__tests__/_vis.js
similarity index 99%
rename from src/ui/public/Vis/__tests__/_Vis.js
rename to src/ui/public/vis/__tests__/_vis.js
index ce243f81ebda8..9fe652cda4cc0 100644
--- a/src/ui/public/Vis/__tests__/_Vis.js
+++ b/src/ui/public/vis/__tests__/_vis.js
@@ -1,7 +1,7 @@
import _ from 'lodash';
import ngMock from 'ngMock';
import expect from 'expect.js';
-import VisProvider from 'ui/Vis';
+import VisProvider from 'ui/vis';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
import RegistryVisTypesProvider from 'ui/registry/vis_types';
describe('Vis Class', function () {
diff --git a/src/ui/public/vis/__tests__/index.js b/src/ui/public/vis/__tests__/index.js
new file mode 100644
index 0000000000000..03825e05e0d9a
--- /dev/null
+++ b/src/ui/public/vis/__tests__/index.js
@@ -0,0 +1,6 @@
+import './_agg_config';
+import './_agg_config_result';
+import './_agg_configs';
+import './_vis';
+describe('Vis Component', function () {
+});
diff --git a/src/ui/public/Vis/AggConfig.js b/src/ui/public/vis/agg_config.js
similarity index 100%
rename from src/ui/public/Vis/AggConfig.js
rename to src/ui/public/vis/agg_config.js
diff --git a/src/ui/public/Vis/AggConfigResult.js b/src/ui/public/vis/agg_config_result.js
similarity index 100%
rename from src/ui/public/Vis/AggConfigResult.js
rename to src/ui/public/vis/agg_config_result.js
diff --git a/src/ui/public/Vis/AggConfigs.js b/src/ui/public/vis/agg_configs.js
similarity index 97%
rename from src/ui/public/Vis/AggConfigs.js
rename to src/ui/public/vis/agg_configs.js
index f95c871e2a5a2..05fcdf4f23a22 100644
--- a/src/ui/public/Vis/AggConfigs.js
+++ b/src/ui/public/vis/agg_configs.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
-import IndexedArray from 'ui/IndexedArray';
-import VisAggConfigProvider from 'ui/Vis/AggConfig';
+import IndexedArray from 'ui/indexed_array';
+import VisAggConfigProvider from 'ui/vis/agg_config';
import AggTypesIndexProvider from 'ui/agg_types/index';
export default function AggConfigsFactory(Private) {
var AggConfig = Private(VisAggConfigProvider);
diff --git a/src/ui/public/Vis/Renderbot.js b/src/ui/public/vis/renderbot.js
similarity index 100%
rename from src/ui/public/Vis/Renderbot.js
rename to src/ui/public/vis/renderbot.js
diff --git a/src/ui/public/Vis/Schemas.js b/src/ui/public/vis/schemas.js
similarity index 93%
rename from src/ui/public/Vis/Schemas.js
rename to src/ui/public/vis/schemas.js
index 7df9d57a37ebd..37fed29291947 100644
--- a/src/ui/public/Vis/Schemas.js
+++ b/src/ui/public/vis/schemas.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
-import IndexedArray from 'ui/IndexedArray';
-import AggTypesAggParamsProvider from 'ui/agg_types/AggParams';
+import IndexedArray from 'ui/indexed_array';
+import AggTypesAggParamsProvider from 'ui/agg_types/agg_params';
export default function VisTypeSchemasFactory(Private) {
var AggParams = Private(AggTypesAggParamsProvider);
diff --git a/src/ui/public/Vis/Vis.js b/src/ui/public/vis/vis.js
similarity index 98%
rename from src/ui/public/Vis/Vis.js
rename to src/ui/public/vis/vis.js
index c13fa144cbab3..fd7d5fda72823 100644
--- a/src/ui/public/Vis/Vis.js
+++ b/src/ui/public/vis/vis.js
@@ -1,7 +1,7 @@
import _ from 'lodash';
import AggTypesIndexProvider from 'ui/agg_types/index';
import RegistryVisTypesProvider from 'ui/registry/vis_types';
-import VisAggConfigsProvider from 'ui/Vis/AggConfigs';
+import VisAggConfigsProvider from 'ui/vis/agg_configs';
export default function VisFactory(Notifier, Private) {
var aggTypes = Private(AggTypesIndexProvider);
var visTypes = Private(RegistryVisTypesProvider);
diff --git a/src/ui/public/Vis/VisType.js b/src/ui/public/vis/vis_type.js
similarity index 92%
rename from src/ui/public/Vis/VisType.js
rename to src/ui/public/vis/vis_type.js
index bb223dabd450a..7df7eca820c6a 100644
--- a/src/ui/public/Vis/VisType.js
+++ b/src/ui/public/vis/vis_type.js
@@ -1,4 +1,4 @@
-import VisSchemasProvider from 'ui/Vis/Schemas';
+import VisSchemasProvider from 'ui/vis/schemas';
export default function VisTypeFactory(Private) {
var VisTypeSchemas = Private(VisSchemasProvider);
diff --git a/src/ui/public/vislib/__tests__/lib/dispatch.js b/src/ui/public/vislib/__tests__/lib/dispatch.js
index f1b9a4fe7d420..a70694303ee6c 100644
--- a/src/ui/public/vislib/__tests__/lib/dispatch.js
+++ b/src/ui/public/vislib/__tests__/lib/dispatch.js
@@ -31,7 +31,7 @@ describe('Vislib Dispatch Class Test Suite', function () {
vis = Private(FixturesVislibVisFixtureProvider)();
persistedState = new (Private(PersistedStatePersistedStateProvider))();
vis.render(data, persistedState);
- SimpleEmitter = require('ui/utils/SimpleEmitter');
+ SimpleEmitter = require('ui/utils/simple_emitter');
}));
afterEach(function () {
diff --git a/src/ui/public/vislib/__tests__/visualizations/pie_chart.js b/src/ui/public/vislib/__tests__/visualizations/pie_chart.js
index 72ba5a623fcdb..9a48e110a5587 100644
--- a/src/ui/public/vislib/__tests__/visualizations/pie_chart.js
+++ b/src/ui/public/vislib/__tests__/visualizations/pie_chart.js
@@ -6,7 +6,7 @@ import _ from 'lodash';
import fixtures from 'fixtures/fake_hierarchical_data';
import $ from 'jquery';
import FixturesVislibVisFixtureProvider from 'fixtures/vislib/_vis_fixture';
-import VisProvider from 'ui/Vis';
+import VisProvider from 'ui/vis';
import PersistedStatePersistedStateProvider from 'ui/persisted_state/persisted_state';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
import AggResponseHierarchicalBuildHierarchicalDataProvider from 'ui/agg_response/hierarchical/build_hierarchical_data';
diff --git a/src/ui/public/vislib/components/Tooltip/__tests__/positioning.js b/src/ui/public/vislib/components/tooltip/__tests__/positioning.js
similarity index 99%
rename from src/ui/public/vislib/components/Tooltip/__tests__/positioning.js
rename to src/ui/public/vislib/components/tooltip/__tests__/positioning.js
index ca299d5fb6efb..a755dd0ab3fa3 100644
--- a/src/ui/public/vislib/components/Tooltip/__tests__/positioning.js
+++ b/src/ui/public/vislib/components/tooltip/__tests__/positioning.js
@@ -2,7 +2,7 @@ import expect from 'expect.js';
import $ from 'jquery';
import _ from 'lodash';
import sinon from 'auto-release-sinon';
-import posTT from '../positionTooltip';
+import posTT from '../position_tooltip';
describe('Tooltip Positioning', function () {
diff --git a/src/ui/public/vislib/components/Tooltip/positionTooltip.js b/src/ui/public/vislib/components/tooltip/position_tooltip.js
similarity index 100%
rename from src/ui/public/vislib/components/Tooltip/positionTooltip.js
rename to src/ui/public/vislib/components/tooltip/position_tooltip.js
diff --git a/src/ui/public/vislib/components/Tooltip/Tooltip.js b/src/ui/public/vislib/components/tooltip/tooltip.js
similarity index 98%
rename from src/ui/public/vislib/components/Tooltip/Tooltip.js
rename to src/ui/public/vislib/components/tooltip/tooltip.js
index 7a1b280893782..11687911c6173 100644
--- a/src/ui/public/vislib/components/Tooltip/Tooltip.js
+++ b/src/ui/public/vislib/components/tooltip/tooltip.js
@@ -1,7 +1,7 @@
import d3 from 'd3';
import _ from 'lodash';
-import Binder from 'ui/Binder';
-import positionTooltip from './positionTooltip';
+import Binder from 'ui/binder';
+import positionTooltip from './position_tooltip';
import $ from 'jquery';
var allContents = [];
diff --git a/src/ui/public/vislib/lib/alerts.js b/src/ui/public/vislib/lib/alerts.js
index 7b1fa24becb1a..76d1404656c04 100644
--- a/src/ui/public/vislib/lib/alerts.js
+++ b/src/ui/public/vislib/lib/alerts.js
@@ -1,7 +1,7 @@
import d3 from 'd3';
import $ from 'jquery';
import _ from 'lodash';
-import Binder from 'ui/Binder';
+import Binder from 'ui/binder';
export default function AlertsFactory(Private) {
/**
diff --git a/src/ui/public/vislib/lib/chart_title.js b/src/ui/public/vislib/lib/chart_title.js
index 21f72550d21b1..26fc5eb5e6edc 100644
--- a/src/ui/public/vislib/lib/chart_title.js
+++ b/src/ui/public/vislib/lib/chart_title.js
@@ -2,7 +2,7 @@ import d3 from 'd3';
import $ from 'jquery';
import _ from 'lodash';
import VislibLibErrorHandlerProvider from 'ui/vislib/lib/_error_handler';
-import VislibComponentsTooltipProvider from 'ui/vislib/components/Tooltip';
+import VislibComponentsTooltipProvider from 'ui/vislib/components/tooltip';
export default function ChartTitleFactory(Private) {
var ErrorHandler = Private(VislibLibErrorHandlerProvider);
diff --git a/src/ui/public/vislib/lib/dispatch.js b/src/ui/public/vislib/lib/dispatch.js
index 93766383b58e4..f7e0d6408ac60 100644
--- a/src/ui/public/vislib/lib/dispatch.js
+++ b/src/ui/public/vislib/lib/dispatch.js
@@ -1,8 +1,8 @@
import d3 from 'd3';
import _ from 'lodash';
import $ from 'jquery';
-import SimpleEmitter from 'ui/utils/SimpleEmitter';
-import VislibComponentsTooltipProvider from 'ui/vislib/components/Tooltip';
+import SimpleEmitter from 'ui/utils/simple_emitter';
+import VislibComponentsTooltipProvider from 'ui/vislib/components/tooltip';
export default function DispatchClass(Private) {
var Tooltip = Private(VislibComponentsTooltipProvider);
diff --git a/src/ui/public/vislib/lib/handler/handler.js b/src/ui/public/vislib/lib/handler/handler.js
index 90790795348bd..b0e4bf6d8ea57 100644
--- a/src/ui/public/vislib/lib/handler/handler.js
+++ b/src/ui/public/vislib/lib/handler/handler.js
@@ -1,7 +1,7 @@
import d3 from 'd3';
import _ from 'lodash';
import errors from 'ui/errors';
-import Binder from 'ui/Binder';
+import Binder from 'ui/binder';
import VislibLibDataProvider from 'ui/vislib/lib/data';
import VislibLibLayoutLayoutProvider from 'ui/vislib/lib/layout/layout';
export default function HandlerBaseClass(Private) {
diff --git a/src/ui/public/vislib/vis.js b/src/ui/public/vislib/vis.js
index c898da3782421..3bbad97139e64 100644
--- a/src/ui/public/vislib/vis.js
+++ b/src/ui/public/vislib/vis.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
import d3 from 'd3';
-import Binder from 'ui/Binder';
+import Binder from 'ui/binder';
import errors from 'ui/errors';
import 'ui/vislib/styles/main.less';
import VislibLibResizeCheckerProvider from 'ui/vislib/lib/resize_checker';
diff --git a/src/ui/public/vislib/visualizations/_chart.js b/src/ui/public/vislib/visualizations/_chart.js
index bbe8ce844342a..32ed7a247eff6 100644
--- a/src/ui/public/vislib/visualizations/_chart.js
+++ b/src/ui/public/vislib/visualizations/_chart.js
@@ -3,7 +3,7 @@ import _ from 'lodash';
import errors from 'ui/errors';
import dataLabel from 'ui/vislib/lib/_data_label';
import VislibLibDispatchProvider from 'ui/vislib/lib/dispatch';
-import VislibComponentsTooltipProvider from 'ui/vislib/components/Tooltip';
+import VislibComponentsTooltipProvider from 'ui/vislib/components/tooltip';
export default function ChartBaseClass(Private) {
var Dispatch = Private(VislibLibDispatchProvider);
diff --git a/src/ui/public/vislib/visualizations/_point_series_chart.js b/src/ui/public/vislib/visualizations/_point_series_chart.js
index 8cfba8ab8c518..449985cbb34e8 100644
--- a/src/ui/public/vislib/visualizations/_point_series_chart.js
+++ b/src/ui/public/vislib/visualizations/_point_series_chart.js
@@ -1,7 +1,7 @@
import d3 from 'd3';
import _ from 'lodash';
import VislibVisualizationsChartProvider from 'ui/vislib/visualizations/_chart';
-import VislibComponentsTooltipProvider from 'ui/vislib/components/Tooltip';
+import VislibComponentsTooltipProvider from 'ui/vislib/components/tooltip';
export default function PointSeriesChartProvider(Private) {
var Chart = Private(VislibVisualizationsChartProvider);
diff --git a/src/ui/public/vislib/visualizations/time_marker.js b/src/ui/public/vislib/visualizations/time_marker.js
index 7f9632682239f..01d57f44978ec 100644
--- a/src/ui/public/vislib/visualizations/time_marker.js
+++ b/src/ui/public/vislib/visualizations/time_marker.js
@@ -1,5 +1,5 @@
import d3 from 'd3';
-import dateMath from 'ui/utils/dateMath';
+import dateMath from 'ui/utils/date_math';
export default function TimeMarkerFactory() {
function TimeMarker(times, xScale, height) {
diff --git a/src/ui/public/vislib_vis_type/__tests__/_buildChartData.js b/src/ui/public/vislib_vis_type/__tests__/_build_chart_data.js
similarity index 99%
rename from src/ui/public/vislib_vis_type/__tests__/_buildChartData.js
rename to src/ui/public/vislib_vis_type/__tests__/_build_chart_data.js
index 7d31365e35a7b..4d9e007fb8425 100644
--- a/src/ui/public/vislib_vis_type/__tests__/_buildChartData.js
+++ b/src/ui/public/vislib_vis_type/__tests__/_build_chart_data.js
@@ -5,7 +5,7 @@ import sinon from 'auto-release-sinon';
import AggResponseTabifyTableProvider from 'ui/agg_response/tabify/_table';
import AggResponseTabifyTableGroupProvider from 'ui/agg_response/tabify/_table_group';
import AggResponseIndexProvider from 'ui/agg_response/index';
-import VislibVisTypeBuildChartDataProvider from 'ui/vislib_vis_type/buildChartData';
+import VislibVisTypeBuildChartDataProvider from 'ui/vislib_vis_type/build_chart_data';
describe('renderbot#buildChartData', function () {
var buildChartData;
diff --git a/src/ui/public/vislib_vis_type/__tests__/_VislibRenderbot.js b/src/ui/public/vislib_vis_type/__tests__/_vislib_renderbot.js
similarity index 98%
rename from src/ui/public/vislib_vis_type/__tests__/_VislibRenderbot.js
rename to src/ui/public/vislib_vis_type/__tests__/_vislib_renderbot.js
index 09d5899113ff4..4492b246211ec 100644
--- a/src/ui/public/vislib_vis_type/__tests__/_VislibRenderbot.js
+++ b/src/ui/public/vislib_vis_type/__tests__/_vislib_renderbot.js
@@ -5,8 +5,8 @@ import expect from 'expect.js';
import sinon from 'auto-release-sinon';
import VislibProvider from 'ui/vislib';
import VislibVisProvider from 'ui/vislib/vis';
-import VisRenderbotProvider from 'ui/Vis/Renderbot';
-import VislibVisTypeVislibRenderbotProvider from 'ui/vislib_vis_type/VislibRenderbot';
+import VisRenderbotProvider from 'ui/vis/renderbot';
+import VislibVisTypeVislibRenderbotProvider from 'ui/vislib_vis_type/vislib_renderbot';
import PersistedStatePersistedStateProvider from 'ui/persisted_state/persisted_state';
import AggResponseIndexProvider from 'ui/agg_response/index';
describe('renderbot', function exportWrapper() {
diff --git a/src/ui/public/vislib_vis_type/__tests__/index.js b/src/ui/public/vislib_vis_type/__tests__/index.js
index d62ecdf7a85e4..6934881ba8355 100644
--- a/src/ui/public/vislib_vis_type/__tests__/index.js
+++ b/src/ui/public/vislib_vis_type/__tests__/index.js
@@ -1,4 +1,4 @@
-import './_VislibRenderbot';
-import './_buildChartData';
+import './_vislib_renderbot';
+import './_build_chart_data';
describe('Vis Type', function () {
});
diff --git a/src/ui/public/vislib_vis_type/buildChartData.js b/src/ui/public/vislib_vis_type/build_chart_data.js
similarity index 100%
rename from src/ui/public/vislib_vis_type/buildChartData.js
rename to src/ui/public/vislib_vis_type/build_chart_data.js
diff --git a/src/ui/public/vislib_vis_type/VislibRenderbot.js b/src/ui/public/vislib_vis_type/vislib_renderbot.js
similarity index 96%
rename from src/ui/public/vislib_vis_type/VislibRenderbot.js
rename to src/ui/public/vislib_vis_type/vislib_renderbot.js
index 59e949a3aaa18..956a61a7047ef 100644
--- a/src/ui/public/vislib_vis_type/VislibRenderbot.js
+++ b/src/ui/public/vislib_vis_type/vislib_renderbot.js
@@ -1,7 +1,7 @@
import _ from 'lodash';
import VislibProvider from 'ui/vislib';
-import VisRenderbotProvider from 'ui/Vis/Renderbot';
-import VislibVisTypeBuildChartDataProvider from 'ui/vislib_vis_type/buildChartData';
+import VisRenderbotProvider from 'ui/vis/renderbot';
+import VislibVisTypeBuildChartDataProvider from 'ui/vislib_vis_type/build_chart_data';
module.exports = function VislibRenderbotFactory(Private) {
var vislib = Private(VislibProvider);
var Renderbot = Private(VisRenderbotProvider);
diff --git a/src/ui/public/vislib_vis_type/VislibVisType.js b/src/ui/public/vislib_vis_type/vislib_vis_type.js
similarity index 90%
rename from src/ui/public/vislib_vis_type/VislibVisType.js
rename to src/ui/public/vislib_vis_type/vislib_vis_type.js
index cf4c3eba9197a..c3c090f3bdfff 100644
--- a/src/ui/public/vislib_vis_type/VislibVisType.js
+++ b/src/ui/public/vislib_vis_type/vislib_vis_type.js
@@ -3,10 +3,10 @@ import 'ui/vislib';
import 'plugins/kbn_vislib_vis_types/controls/vislib_basic_options';
import 'plugins/kbn_vislib_vis_types/controls/point_series_options';
import 'plugins/kbn_vislib_vis_types/controls/line_interpolation_option';
-import VisSchemasProvider from 'ui/Vis/Schemas';
-import VisVisTypeProvider from 'ui/Vis/VisType';
+import VisSchemasProvider from 'ui/vis/schemas';
+import VisVisTypeProvider from 'ui/vis/vis_type';
import AggResponsePointSeriesPointSeriesProvider from 'ui/agg_response/point_series/point_series';
-import VislibVisTypeVislibRenderbotProvider from 'ui/vislib_vis_type/VislibRenderbot';
+import VislibVisTypeVislibRenderbotProvider from 'ui/vislib_vis_type/vislib_renderbot';
export default function VislibVisTypeFactory(Private) {
var VisTypeSchemas = Private(VisSchemasProvider);
diff --git a/src/ui/ui_bundler_env.js b/src/ui/ui_bundler_env.js
index b8145d49cc439..96bdf699aec3a 100644
--- a/src/ui/ui_bundler_env.js
+++ b/src/ui/ui_bundler_env.js
@@ -1,4 +1,4 @@
-import fromRoot from '../utils/fromRoot';
+import fromRoot from '../utils/from_root';
import { includes, flow, escapeRegExp } from 'lodash';
import { isString, isArray, isPlainObject, get } from 'lodash';
import { keys } from 'lodash';
diff --git a/src/ui/views/rootRedirect.jade b/src/ui/views/root_redirect.jade
similarity index 100%
rename from src/ui/views/rootRedirect.jade
rename to src/ui/views/root_redirect.jade
diff --git a/src/utils/Collection.js b/src/utils/collection.js
similarity index 100%
rename from src/utils/Collection.js
rename to src/utils/collection.js
diff --git a/src/utils/fromRoot.js b/src/utils/from_root.js
similarity index 71%
rename from src/utils/fromRoot.js
rename to src/utils/from_root.js
index f7e8ac8e9cd11..bc1c3db9d36b7 100644
--- a/src/utils/fromRoot.js
+++ b/src/utils/from_root.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import { __dirname as root } from './packageJson';
+import { __dirname as root } from './package_json';
import { join, dirname, normalize } from 'path';
module.exports = _.flow(_.partial(join, root), normalize);
diff --git a/src/utils/packageJson.js b/src/utils/package_json.js
similarity index 100%
rename from src/utils/packageJson.js
rename to src/utils/package_json.js
diff --git a/src/utils/pathContains.js b/src/utils/path_contains.js
similarity index 100%
rename from src/utils/pathContains.js
rename to src/utils/path_contains.js
diff --git a/tasks/build/babelOptions.js b/tasks/build/babel_options.js
similarity index 100%
rename from tasks/build/babelOptions.js
rename to tasks/build/babel_options.js
diff --git a/tasks/build/downloadNodeBuilds.js b/tasks/build/download_node_builds.js
similarity index 100%
rename from tasks/build/downloadNodeBuilds.js
rename to tasks/build/download_node_builds.js
diff --git a/tasks/build/getProps.js b/tasks/build/get_props.js
similarity index 100%
rename from tasks/build/getProps.js
rename to tasks/build/get_props.js
diff --git a/tasks/build/installNpmDeps.js b/tasks/build/install_npm_deps.js
similarity index 100%
rename from tasks/build/installNpmDeps.js
rename to tasks/build/install_npm_deps.js
diff --git a/tasks/build/installedPlugins.js b/tasks/build/installed_plugins.js
similarity index 100%
rename from tasks/build/installedPlugins.js
rename to tasks/build/installed_plugins.js
diff --git a/tasks/build/osPackages.js b/tasks/build/os_packages.js
similarity index 100%
rename from tasks/build/osPackages.js
rename to tasks/build/os_packages.js
diff --git a/tasks/build/packageJson.js b/tasks/build/package_json.js
similarity index 100%
rename from tasks/build/packageJson.js
rename to tasks/build/package_json.js
diff --git a/tasks/build/removePkgJsonDeps.js b/tasks/build/remove_pkg_json_deps.js
similarity index 100%
rename from tasks/build/removePkgJsonDeps.js
rename to tasks/build/remove_pkg_json_deps.js
diff --git a/tasks/build/versionedLinks.js b/tasks/build/versioned_links.js
similarity index 100%
rename from tasks/build/versionedLinks.js
rename to tasks/build/versioned_links.js
diff --git a/tasks/config/downloadSelenium.js b/tasks/config/download_selenium.js
similarity index 100%
rename from tasks/config/downloadSelenium.js
rename to tasks/config/download_selenium.js
diff --git a/tasks/downloadSelenium.js b/tasks/download_selenium.js
similarity index 100%
rename from tasks/downloadSelenium.js
rename to tasks/download_selenium.js
diff --git a/tasks/utils/updateVersion.js b/tasks/utils/update_version.js
similarity index 100%
rename from tasks/utils/updateVersion.js
rename to tasks/utils/update_version.js
diff --git a/test/apiIntern.js b/test/api_intern.js
similarity index 100%
rename from test/apiIntern.js
rename to test/api_intern.js
diff --git a/test/fixtures/scenarios/emptyKibana/kibana.js b/test/fixtures/scenarios/empty_kibana/kibana.js
similarity index 100%
rename from test/fixtures/scenarios/emptyKibana/kibana.js
rename to test/fixtures/scenarios/empty_kibana/kibana.js
diff --git a/test/fixtures/scenarios/emptyKibana/kibanaDefinition.js b/test/fixtures/scenarios/empty_kibana/kibana_definition.js
similarity index 100%
rename from test/fixtures/scenarios/emptyKibana/kibanaDefinition.js
rename to test/fixtures/scenarios/empty_kibana/kibana_definition.js
diff --git a/test/fixtures/scenarios/logstashFunctional/logstash-2015.09.20.js b/test/fixtures/scenarios/logstash_functional/logstash-2015.09.20.js
similarity index 100%
rename from test/fixtures/scenarios/logstashFunctional/logstash-2015.09.20.js
rename to test/fixtures/scenarios/logstash_functional/logstash-2015.09.20.js
diff --git a/test/fixtures/scenarios/logstashFunctional/logstash-2015.09.21.js b/test/fixtures/scenarios/logstash_functional/logstash-2015.09.21.js
similarity index 100%
rename from test/fixtures/scenarios/logstashFunctional/logstash-2015.09.21.js
rename to test/fixtures/scenarios/logstash_functional/logstash-2015.09.21.js
diff --git a/test/fixtures/scenarios/logstashFunctional/logstash-2015.09.22.js b/test/fixtures/scenarios/logstash_functional/logstash-2015.09.22.js
similarity index 100%
rename from test/fixtures/scenarios/logstashFunctional/logstash-2015.09.22.js
rename to test/fixtures/scenarios/logstash_functional/logstash-2015.09.22.js
diff --git a/test/fixtures/scenarios/logstashFunctional/makelogsIndexDefinition.js b/test/fixtures/scenarios/logstash_functional/makelogs_index_definition.js
similarity index 100%
rename from test/fixtures/scenarios/logstashFunctional/makelogsIndexDefinition.js
rename to test/fixtures/scenarios/logstash_functional/makelogs_index_definition.js
diff --git a/test/fixtures/scenarios/makelogs/makelogsIndexDefinition.js b/test/fixtures/scenarios/makelogs/makelogs_index_definition.js
similarity index 100%
rename from test/fixtures/scenarios/makelogs/makelogsIndexDefinition.js
rename to test/fixtures/scenarios/makelogs/makelogs_index_definition.js
diff --git a/test/mocha_setup.js b/test/mocha_setup.js
index 8404ab88be2f6..ea24360a11832 100644
--- a/test/mocha_setup.js
+++ b/test/mocha_setup.js
@@ -1,7 +1,7 @@
var sinon = require('sinon');
var autoRelease = require('auto-release-sinon');
-require('babel/register')(require('../src/optimize/babelOptions').node);
+require('babel/register')(require('../src/optimize/babel_options').node);
// hook into the global afterEach variable to allow autoReleaseSinon to register
// an afterEach handler before mocha has exposed itself to the test files.
diff --git a/test/serverConfig.js b/test/server_config.js
similarity index 100%
rename from test/serverConfig.js
rename to test/server_config.js
diff --git a/test/utils/__tests__/getPage.js b/test/utils/__tests__/get_page.js
similarity index 95%
rename from test/utils/__tests__/getPage.js
rename to test/utils/__tests__/get_page.js
index 19ce3a1fae24b..1875c6b26da82 100644
--- a/test/utils/__tests__/getPage.js
+++ b/test/utils/__tests__/get_page.js
@@ -1,5 +1,5 @@
var expect = require('expect.js');
-var getUrl = require('../getUrl');
+var getUrl = require('../get_url');
describe('getUrl', function () {
it('should convert to a url', function () {
diff --git a/test/utils/getUrl.js b/test/utils/get_url.js
similarity index 100%
rename from test/utils/getUrl.js
rename to test/utils/get_url.js
From ba19a81dd23db6b0aca815697e07d7bb2ec8917a Mon Sep 17 00:00:00 2001
From: spalger <spalger@users.noreply.github.com>
Date: Wed, 24 Feb 2016 13:00:46 -0800
Subject: [PATCH 02/12] testUtils -> test_utils
---
Gruntfile.js | 2 +-
src/fixtures/stubbed_logstash_index_pattern.js | 2 +-
src/plugins/tests_bundle/index.js | 2 +-
src/test_utils/no_digest_promises.js | 2 +-
.../public/agg_types/__tests__/controls/number_list.js | 2 +-
.../public/courier/data_source/__tests__/doc_source.js | 2 +-
.../courier/data_source/__tests__/search_source.js | 2 +-
src/ui/public/courier/fetch/__tests__/fetch.js | 2 +-
.../fetch/request/__tests__/segmented_create_queue.js | 2 +-
.../request/__tests__/segmented_index_selection.js | 2 +-
.../fetch/request/__tests__/segmented_size_picking.js | 2 +-
src/ui/public/factories/__tests__/events.js | 2 +-
src/ui/public/filter_bar/__tests__/filter_bar.js | 2 +-
.../public/index_patterns/__tests__/_index_pattern.js | 10 +++++-----
.../index_patterns/__tests__/calculate_indices.js | 2 +-
.../persisted_state/__tests__/persisted_state.js | 2 +-
.../public/routes/__tests__/_wrap_route_with_prep.js | 2 +-
src/ui/public/vislib/__tests__/lib/resize_checker.js | 2 +-
tasks/config/copy.js | 6 +++---
19 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/Gruntfile.js b/Gruntfile.js
index a7867384a6faf..48d88d97ef8c2 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -12,7 +12,7 @@ module.exports = function (grunt) {
plugins: __dirname + '/src/plugins',
server: __dirname + '/src/server',
target: __dirname + '/target', // location of the compressed build targets
- testUtilsDir: __dirname + '/src/testUtils',
+ testUtilsDir: __dirname + '/src/test_utils',
configFile: __dirname + '/src/config/kibana.yml',
karmaBrowser: (function () {
diff --git a/src/fixtures/stubbed_logstash_index_pattern.js b/src/fixtures/stubbed_logstash_index_pattern.js
index cac43c3255d3d..1bbcfd76e175c 100644
--- a/src/fixtures/stubbed_logstash_index_pattern.js
+++ b/src/fixtures/stubbed_logstash_index_pattern.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import TestUtilsStubIndexPatternProvider from 'testUtils/stub_index_pattern';
+import TestUtilsStubIndexPatternProvider from 'test_utils/stub_index_pattern';
import IndexPatternsFieldTypesProvider from 'ui/index_patterns/_field_types';
import FixturesLogstashFieldsProvider from 'fixtures/logstash_fields';
export default function stubbedLogstashIndexPatternService(Private) {
diff --git a/src/plugins/tests_bundle/index.js b/src/plugins/tests_bundle/index.js
index 9aeb868079f87..24af848da2d78 100644
--- a/src/plugins/tests_bundle/index.js
+++ b/src/plugins/tests_bundle/index.js
@@ -69,7 +69,7 @@ module.exports = (kibana) => {
modules: {
ngMock$: fromRoot('src/plugins/devMode/public/ngMock'),
fixtures: fromRoot('src/fixtures'),
- testUtils: fromRoot('src/testUtils'),
+ test_utils: fromRoot('src/test_utils'),
'angular-mocks': {
path: require.resolve('angular-mocks'),
imports: 'angular'
diff --git a/src/test_utils/no_digest_promises.js b/src/test_utils/no_digest_promises.js
index 02376b5f5fd89..98ce02c45942a 100644
--- a/src/test_utils/no_digest_promises.js
+++ b/src/test_utils/no_digest_promises.js
@@ -8,7 +8,7 @@ Bluebird.longStackTraces();
* replace the Promise service with Bluebird so that tests
* can use promises without having to call $rootScope.apply()
*
- * var noDigestPromises = require('testUtils/noDigestPromises');
+ * var noDigestPromises = require('test_utils/no_digest_promises');
*
* describe('some module that does complex shit with promises', function () {
* beforeEach(noDigestPromises.activate);
diff --git a/src/ui/public/agg_types/__tests__/controls/number_list.js b/src/ui/public/agg_types/__tests__/controls/number_list.js
index 8b1e0be98305d..9cee01c17f6e2 100644
--- a/src/ui/public/agg_types/__tests__/controls/number_list.js
+++ b/src/ui/public/agg_types/__tests__/controls/number_list.js
@@ -1,7 +1,7 @@
import $ from 'jquery';
import _ from 'lodash';
import expect from 'expect.js';
-import simulateKeys from 'testUtils/simulateKeys';
+import simulateKeys from 'test_utils/simulate_keys';
import ngMock from 'ngMock';
import 'ui/number_list';
describe('NumberList directive', function () {
diff --git a/src/ui/public/courier/data_source/__tests__/doc_source.js b/src/ui/public/courier/data_source/__tests__/doc_source.js
index 6ff86a2c80c01..a9d16fee43533 100644
--- a/src/ui/public/courier/data_source/__tests__/doc_source.js
+++ b/src/ui/public/courier/data_source/__tests__/doc_source.js
@@ -6,7 +6,7 @@ import RequestQueueProv from '../../_request_queue';
import DocSourceProv from '../doc_source';
describe('DocSource', function () {
- require('testUtils/noDigestPromises').activateForSuite();
+ require('test_utils/no_digest_promises').activateForSuite();
let requestQueue;
let DocSource;
diff --git a/src/ui/public/courier/data_source/__tests__/search_source.js b/src/ui/public/courier/data_source/__tests__/search_source.js
index 02f4f73d2aa29..677fde8d85fb7 100644
--- a/src/ui/public/courier/data_source/__tests__/search_source.js
+++ b/src/ui/public/courier/data_source/__tests__/search_source.js
@@ -6,7 +6,7 @@ import RequestQueueProv from '../../_request_queue';
import SearchSourceProv from '../search_source';
describe('SearchSource', function () {
- require('testUtils/noDigestPromises').activateForSuite();
+ require('test_utils/no_digest_promises').activateForSuite();
let requestQueue;
let SearchSource;
diff --git a/src/ui/public/courier/fetch/__tests__/fetch.js b/src/ui/public/courier/fetch/__tests__/fetch.js
index dad88dd6c93de..3666744582f21 100644
--- a/src/ui/public/courier/fetch/__tests__/fetch.js
+++ b/src/ui/public/courier/fetch/__tests__/fetch.js
@@ -9,7 +9,7 @@ import CourierDataSourceDocSourceProvider from 'ui/courier/data_source/doc_sourc
import CourierDataSourceSearchSourceProvider from 'ui/courier/data_source/search_source';
describe('Fetch service', function () {
- require('testUtils/noDigestPromises').activateForSuite();
+ require('test_utils/no_digest_promises').activateForSuite();
let es;
let fetch;
diff --git a/src/ui/public/courier/fetch/request/__tests__/segmented_create_queue.js b/src/ui/public/courier/fetch/request/__tests__/segmented_create_queue.js
index c63cc5d0db325..9bed019d19007 100644
--- a/src/ui/public/courier/fetch/request/__tests__/segmented_create_queue.js
+++ b/src/ui/public/courier/fetch/request/__tests__/segmented_create_queue.js
@@ -10,7 +10,7 @@ describe('ui/courier/fetch/request/segmented/_createQueue', () => {
let SegmentedReq;
let MockSource;
- require('testUtils/noDigestPromises').activateForSuite();
+ require('test_utils/no_digest_promises').activateForSuite();
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject((Private, $injector) => {
diff --git a/src/ui/public/courier/fetch/request/__tests__/segmented_index_selection.js b/src/ui/public/courier/fetch/request/__tests__/segmented_index_selection.js
index 336d7e9570839..e782b2f2b5c4a 100644
--- a/src/ui/public/courier/fetch/request/__tests__/segmented_index_selection.js
+++ b/src/ui/public/courier/fetch/request/__tests__/segmented_index_selection.js
@@ -4,7 +4,7 @@ import { times } from 'lodash';
import sinon from 'auto-release-sinon';
import HitSortFnProv from 'plugins/kibana/discover/_hit_sort_fn';
-import NoDigestPromises from 'testUtils/noDigestPromises';
+import NoDigestPromises from 'test_utils/no_digest_promises';
import StubbedSearchSourceProvider from 'fixtures/stubbed_search_source';
import CourierFetchRequestSegmentedProvider from 'ui/courier/fetch/request/segmented';
diff --git a/src/ui/public/courier/fetch/request/__tests__/segmented_size_picking.js b/src/ui/public/courier/fetch/request/__tests__/segmented_size_picking.js
index 7e40a44dea777..4047130a19029 100644
--- a/src/ui/public/courier/fetch/request/__tests__/segmented_size_picking.js
+++ b/src/ui/public/courier/fetch/request/__tests__/segmented_size_picking.js
@@ -4,7 +4,7 @@ import { times } from 'lodash';
import sinon from 'auto-release-sinon';
import HitSortFnProv from 'plugins/kibana/discover/_hit_sort_fn';
-import NoDigestPromises from 'testUtils/noDigestPromises';
+import NoDigestPromises from 'test_utils/no_digest_promises';
import StubbedSearchSourceProvider from 'fixtures/stubbed_search_source';
import CourierFetchRequestSegmentedProvider from 'ui/courier/fetch/request/segmented';
diff --git a/src/ui/public/factories/__tests__/events.js b/src/ui/public/factories/__tests__/events.js
index a9bde866fb06b..cfe0fbfa1778c 100644
--- a/src/ui/public/factories/__tests__/events.js
+++ b/src/ui/public/factories/__tests__/events.js
@@ -8,7 +8,7 @@ import 'ui/private';
import EventsProvider from 'ui/events';
describe('Events', function () {
- require('testUtils/noDigestPromises').activateForSuite();
+ require('test_utils/no_digest_promises').activateForSuite();
var $rootScope;
var Events;
diff --git a/src/ui/public/filter_bar/__tests__/filter_bar.js b/src/ui/public/filter_bar/__tests__/filter_bar.js
index 51a4fbcdbe89d..5a80892ae7bde 100644
--- a/src/ui/public/filter_bar/__tests__/filter_bar.js
+++ b/src/ui/public/filter_bar/__tests__/filter_bar.js
@@ -20,7 +20,7 @@ describe('Filter Bar Directive', function () {
var mapFilter;
var $el;
var $scope;
- // require('testUtils/noDigestPromises').activateForSuite();
+ // require('test_utils/no_digest_promises').activateForSuite();
beforeEach(ngMock.module('kibana/global_state', function ($provide) {
$provide.service('getAppState', _.constant(_.constant(
diff --git a/src/ui/public/index_patterns/__tests__/_index_pattern.js b/src/ui/public/index_patterns/__tests__/_index_pattern.js
index 8003fcd6fd411..e71284a084b63 100644
--- a/src/ui/public/index_patterns/__tests__/_index_pattern.js
+++ b/src/ui/public/index_patterns/__tests__/_index_pattern.js
@@ -146,7 +146,7 @@ describe('index pattern', function () {
describe('refresh fields', function () {
// override the default indexPattern, with a truncated field list
- require('testUtils/noDigestPromises').activateForSuite();
+ require('test_utils/no_digest_promises').activateForSuite();
var indexPatternId = 'test-pattern';
var indexPattern;
var fieldLength;
@@ -301,7 +301,7 @@ describe('index pattern', function () {
});
describe('#toDetailedIndexList', function () {
- require('testUtils/noDigestPromises').activateForSuite();
+ require('test_utils/no_digest_promises').activateForSuite();
context('when index pattern is an interval', function () {
var interval;
beforeEach(function () {
@@ -380,7 +380,7 @@ describe('index pattern', function () {
describe('#toIndexList', function () {
context('when index pattern is an interval', function () {
- require('testUtils/noDigestPromises').activateForSuite();
+ require('test_utils/no_digest_promises').activateForSuite();
var interval;
beforeEach(function () {
@@ -411,7 +411,7 @@ describe('index pattern', function () {
});
context('when index pattern is a time-base wildcard', function () {
- require('testUtils/noDigestPromises').activateForSuite();
+ require('test_utils/no_digest_promises').activateForSuite();
beforeEach(function () {
sinon.stub(indexPattern, 'getInterval').returns(false);
sinon.stub(indexPattern, 'hasTimeField').returns(true);
@@ -433,7 +433,7 @@ describe('index pattern', function () {
});
context('when index pattern is a time-base wildcard that is configured not to expand', function () {
- require('testUtils/noDigestPromises').activateForSuite();
+ require('test_utils/no_digest_promises').activateForSuite();
beforeEach(function () {
sinon.stub(indexPattern, 'getInterval').returns(false);
sinon.stub(indexPattern, 'hasTimeField').returns(true);
diff --git a/src/ui/public/index_patterns/__tests__/calculate_indices.js b/src/ui/public/index_patterns/__tests__/calculate_indices.js
index 050574d978205..ae190f029fcca 100644
--- a/src/ui/public/index_patterns/__tests__/calculate_indices.js
+++ b/src/ui/public/index_patterns/__tests__/calculate_indices.js
@@ -119,7 +119,7 @@ describe('ui/index_patterns/_calculate_indices', () => {
});
describe('response sorting', function () {
- require('testUtils/noDigestPromises').activateForSuite();
+ require('test_utils/no_digest_promises').activateForSuite();
context('when no sorting direction given', function () {
it('returns the indices in the order that elasticsearch sends them', function () {
diff --git a/src/ui/public/persisted_state/__tests__/persisted_state.js b/src/ui/public/persisted_state/__tests__/persisted_state.js
index dabc4af72f3a7..b411dc076af0d 100644
--- a/src/ui/public/persisted_state/__tests__/persisted_state.js
+++ b/src/ui/public/persisted_state/__tests__/persisted_state.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
import sinon from 'auto-release-sinon';
-import noDigestPromises from 'testUtils/noDigestPromises';
+import noDigestPromises from 'test_utils/no_digest_promises';
import ngMock from 'ngMock';
import expect from 'expect.js';
import errors from 'ui/errors';
diff --git a/src/ui/public/routes/__tests__/_wrap_route_with_prep.js b/src/ui/public/routes/__tests__/_wrap_route_with_prep.js
index 8218daae71cb9..8118467142c5c 100644
--- a/src/ui/public/routes/__tests__/_wrap_route_with_prep.js
+++ b/src/ui/public/routes/__tests__/_wrap_route_with_prep.js
@@ -12,7 +12,7 @@ import 'ui/private';
var routes;
describe('wrapRouteWithPrep fn', function () {
- require('testUtils/noDigestPromises').activateForSuite();
+ require('test_utils/no_digest_promises').activateForSuite();
beforeEach(function () {
routes = new RouteManager();
diff --git a/src/ui/public/vislib/__tests__/lib/resize_checker.js b/src/ui/public/vislib/__tests__/lib/resize_checker.js
index d3b3b40fedc52..edbabd11a2878 100644
--- a/src/ui/public/vislib/__tests__/lib/resize_checker.js
+++ b/src/ui/public/vislib/__tests__/lib/resize_checker.js
@@ -10,7 +10,7 @@ import ReflowWatcherProvider from 'ui/reflow_watcher';
describe('Vislib Resize Checker', function () {
- require('testUtils/noDigestPromises').activateForSuite();
+ require('test_utils/no_digest_promises').activateForSuite();
var ResizeChecker;
var EventEmitter;
diff --git a/tasks/config/copy.js b/tasks/config/copy.js
index 94e9a8bd37933..5fe03a5af3aac 100644
--- a/tasks/config/copy.js
+++ b/tasks/config/copy.js
@@ -8,10 +8,10 @@ module.exports = function (grunt) {
'webpackShims/**',
'config/kibana.yml',
'!src/**/__tests__/**',
- '!src/testUtils/**',
+ '!src/test_utils/**',
'!src/fixtures/**',
- '!src/plugins/devMode/**',
- '!src/plugins/testsBundle/**',
+ '!src/plugins/dev_mode/**',
+ '!src/plugins/tests_bundle/**',
'!src/cli/cluster/**',
],
dest: 'build/kibana',
From 506c9939b9957dd71ecdcc54a8190f9aa2f0de74 Mon Sep 17 00:00:00 2001
From: spalger <spalger@users.noreply.github.com>
Date: Wed, 24 Feb 2016 13:27:33 -0800
Subject: [PATCH 03/12] [npm] remove requirefrom package
---
package.json | 1 -
src/cli/cli.js | 3 +--
src/cli/cluster/cluster_manager.js | 3 +--
src/cli/plugin/__tests__/setting_parser.js | 3 +--
src/cli/plugin/plugin.js | 3 +--
src/cli/plugin/plugin_installer.js | 3 +--
src/cli/serve/read_yaml_config.js | 4 +---
src/cli/serve/serve.js | 5 ++---
src/optimize/lazy/optmzrRole.js | 7 ++-----
src/plugins/elasticsearch/lib/__tests__/is_upgradeable.js | 3 +--
src/plugins/elasticsearch/lib/__tests__/routes.js | 3 +--
src/plugins/elasticsearch/lib/is_upgradeable.js | 1 -
src/plugins/elasticsearch/lib/upgrade_config.js | 3 ---
src/plugins/testsBundle/index.js | 6 ++----
src/server/KbnServer.js | 6 +++---
src/server/__tests__/basePath.js | 4 +---
src/server/config/config.js | 2 +-
src/server/config/schema.js | 3 +--
src/server/http/__tests__/index.js | 5 +----
src/server/http/__tests__/xsrf.js | 4 +---
src/server/plugins/PluginCollection.js | 2 +-
src/ui/ui_app_collection.js | 2 +-
tasks/config/babel.js | 2 +-
tasks/config/esvm.js | 2 +-
test/utils/kbn_server.js | 7 ++-----
25 files changed, 28 insertions(+), 59 deletions(-)
diff --git a/package.json b/package.json
index a57c6737efb2c..8cf45b7333f11 100644
--- a/package.json
+++ b/package.json
@@ -127,7 +127,6 @@
"moment-timezone": "0.4.1",
"raw-loader": "0.5.1",
"request": "2.61.0",
- "requirefrom": "0.2.0",
"rimraf": "2.4.3",
"rjs-repack-loader": "1.0.6",
"script-loader": "0.6.1",
diff --git a/src/cli/cli.js b/src/cli/cli.js
index edc838706919d..bf90bb2da8a52 100644
--- a/src/cli/cli.js
+++ b/src/cli/cli.js
@@ -1,7 +1,6 @@
import _ from 'lodash';
-let utils = require('requirefrom')('src/utils');
-let pkg = utils('packageJson');
+import pkg from '../utils/packageJson';
import Command from './Command';
let argv = process.env.kbnWorkerArgv ? JSON.parse(process.env.kbnWorkerArgv) : process.argv.slice();
diff --git a/src/cli/cluster/cluster_manager.js b/src/cli/cluster/cluster_manager.js
index dce3184ba61af..a80423be31049 100644
--- a/src/cli/cluster/cluster_manager.js
+++ b/src/cli/cluster/cluster_manager.js
@@ -83,8 +83,7 @@ module.exports = class ClusterManager {
setupWatching(extraPaths) {
const chokidar = require('chokidar');
- const utils = require('requirefrom')('src/utils');
- const fromRoot = utils('fromRoot');
+ const fromRoot = require('../../utils/fromRoot');
this.watcher = chokidar.watch([
'src/plugins',
diff --git a/src/cli/plugin/__tests__/setting_parser.js b/src/cli/plugin/__tests__/setting_parser.js
index 957af28bbd3ed..09cb0ddd9c3bb 100644
--- a/src/cli/plugin/__tests__/setting_parser.js
+++ b/src/cli/plugin/__tests__/setting_parser.js
@@ -1,8 +1,7 @@
import path from 'path';
import expect from 'expect.js';
-var utils = require('requirefrom')('src/utils');
-var fromRoot = utils('fromRoot');
+import fromRoot from '../../../utils/fromRoot';
import settingParser from '../setting_parser';
describe('kibana cli', function () {
diff --git a/src/cli/plugin/plugin.js b/src/cli/plugin/plugin.js
index 891f8cf88baf5..5cf125775b804 100644
--- a/src/cli/plugin/plugin.js
+++ b/src/cli/plugin/plugin.js
@@ -1,5 +1,4 @@
-const utils = require('requirefrom')('src/utils');
-const fromRoot = utils('fromRoot');
+import fromRoot from '../../utils/fromRoot';
import settingParser from './setting_parser';
import installer from './plugin_installer';
import remover from './plugin_remover';
diff --git a/src/cli/plugin/plugin_installer.js b/src/cli/plugin/plugin_installer.js
index 23010bf6ef493..56c558ff68889 100644
--- a/src/cli/plugin/plugin_installer.js
+++ b/src/cli/plugin/plugin_installer.js
@@ -1,6 +1,5 @@
import _ from 'lodash';
-const utils = require('requirefrom')('src/utils');
-const fromRoot = utils('fromRoot');
+import fromRoot from '../../utils/fromRoot';
import pluginDownloader from './plugin_downloader';
import pluginCleaner from './plugin_cleaner';
import pluginExtractor from './plugin_extractor';
diff --git a/src/cli/serve/read_yaml_config.js b/src/cli/serve/read_yaml_config.js
index 53ae88e5e41fb..0c28635eddc76 100644
--- a/src/cli/serve/read_yaml_config.js
+++ b/src/cli/serve/read_yaml_config.js
@@ -2,8 +2,7 @@ import _ from 'lodash';
import fs from 'fs';
import yaml from 'js-yaml';
-let utils = require('requirefrom')('src/utils');
-let fromRoot = utils('fromRoot');
+import fromRoot from '../../utils/fromRoot';
let legacySettingMap = {
// server
@@ -67,4 +66,3 @@ module.exports = function (path) {
apply(config, val, key);
}, {});
};
-
diff --git a/src/cli/serve/serve.js b/src/cli/serve/serve.js
index 51b6b04406f0b..675840b979fc5 100644
--- a/src/cli/serve/serve.js
+++ b/src/cli/serve/serve.js
@@ -3,8 +3,7 @@ const { isWorker } = require('cluster');
const { resolve } = require('path');
const cwd = process.cwd();
-const src = require('requirefrom')('src');
-const fromRoot = src('utils/fromRoot');
+import fromRoot from '../../utils/fromRoot';
let canCluster;
try {
@@ -127,7 +126,7 @@ module.exports = function (program) {
}
let kbnServer = {};
- const KbnServer = src('server/KbnServer');
+ const KbnServer = require('../../server/KbnServer');
try {
kbnServer = new KbnServer(settings);
await kbnServer.ready();
diff --git a/src/optimize/lazy/optmzrRole.js b/src/optimize/lazy/optmzrRole.js
index 51bdcc6ae9705..129d309576329 100644
--- a/src/optimize/lazy/optmzrRole.js
+++ b/src/optimize/lazy/optmzrRole.js
@@ -1,10 +1,8 @@
import LazyServer from './LazyServer';
import LazyOptimizer from './LazyOptimizer';
-module.exports = async (kbnServer, kibanaHapiServer, config) => {
-
- let src = require('requirefrom')('src');
- let fromRoot = src('utils/fromRoot');
+import fromRoot from '../../utils/fromRoot';
+export default async (kbnServer, kibanaHapiServer, config) => {
let server = new LazyServer(
config.get('optimize.lazyHost'),
config.get('optimize.lazyPort'),
@@ -20,7 +18,6 @@ module.exports = async (kbnServer, kibanaHapiServer, config) => {
})
);
-
let ready = false;
let sendReady = () => {
diff --git a/src/plugins/elasticsearch/lib/__tests__/is_upgradeable.js b/src/plugins/elasticsearch/lib/__tests__/is_upgradeable.js
index ae269e3897feb..e64de8a89a07a 100644
--- a/src/plugins/elasticsearch/lib/__tests__/is_upgradeable.js
+++ b/src/plugins/elasticsearch/lib/__tests__/is_upgradeable.js
@@ -3,8 +3,7 @@ import expect from 'expect.js';
import sinon from 'sinon';
import isUpgradeable from '../is_upgradeable';
-let utils = require('requirefrom')('src/utils');
-let pkg = utils('packageJson');
+import pkg from '../../../../utils/packageJson';
let version = pkg.version;
describe('plugins/elasticsearch', function () {
diff --git a/src/plugins/elasticsearch/lib/__tests__/routes.js b/src/plugins/elasticsearch/lib/__tests__/routes.js
index 95a34e37ddc2b..2d88e49aea4f0 100644
--- a/src/plugins/elasticsearch/lib/__tests__/routes.js
+++ b/src/plugins/elasticsearch/lib/__tests__/routes.js
@@ -1,7 +1,6 @@
import expect from 'expect.js';
import util from 'util';
-const requireFromTest = require('requirefrom')('test');
-const kbnTestServer = requireFromTest('utils/kbn_server');
+import kbnTestServer from '../../../../../test/utils/kbn_server';
const format = util.format;
diff --git a/src/plugins/elasticsearch/lib/is_upgradeable.js b/src/plugins/elasticsearch/lib/is_upgradeable.js
index e1416021bb8fa..115cdbe138e79 100644
--- a/src/plugins/elasticsearch/lib/is_upgradeable.js
+++ b/src/plugins/elasticsearch/lib/is_upgradeable.js
@@ -1,5 +1,4 @@
import semver from 'semver';
-const utils = require('requirefrom')('src/utils');
const rcVersionRegex = /(\d+\.\d+\.\d+)\-rc(\d+)/i;
module.exports = function (server, doc) {
diff --git a/src/plugins/elasticsearch/lib/upgrade_config.js b/src/plugins/elasticsearch/lib/upgrade_config.js
index 12f26a65a7353..f0919efd319f8 100644
--- a/src/plugins/elasticsearch/lib/upgrade_config.js
+++ b/src/plugins/elasticsearch/lib/upgrade_config.js
@@ -3,8 +3,6 @@ import isUpgradeable from './is_upgradeable';
import _ from 'lodash';
import { format } from 'util';
-const utils = require('requirefrom')('src/utils');
-
module.exports = function (server) {
const MAX_INTEGER = Math.pow(2, 53) - 1;
@@ -54,4 +52,3 @@ module.exports = function (server) {
});
};
};
-
diff --git a/src/plugins/testsBundle/index.js b/src/plugins/testsBundle/index.js
index cac0be6e064ca..297492e513db4 100644
--- a/src/plugins/testsBundle/index.js
+++ b/src/plugins/testsBundle/index.js
@@ -1,10 +1,8 @@
import { union } from 'lodash';
import findSourceFiles from './findSourceFiles';
-module.exports = (kibana) => {
-
- let utils = require('requirefrom')('src/utils');
- let fromRoot = utils('fromRoot');
+import fromRoot from '../../utils/fromRoot';
+export default (kibana) => {
return new kibana.Plugin({
config: (Joi) => {
return Joi.object({
diff --git a/src/server/KbnServer.js b/src/server/KbnServer.js
index 89c825fc21203..37ab022368b20 100644
--- a/src/server/KbnServer.js
+++ b/src/server/KbnServer.js
@@ -1,10 +1,10 @@
import Hapi from 'hapi';
import { constant, once, compact, flatten } from 'lodash';
import { promisify, resolve, fromNode } from 'bluebird';
+import fromRoot from '../utils/fromRoot';
+import pkg from '../utils/packageJson';
-let utils = require('requirefrom')('src/utils');
-let rootDir = utils('fromRoot')('.');
-let pkg = utils('packageJson');
+let rootDir = fromRoot('.');
module.exports = class KbnServer {
constructor(settings) {
diff --git a/src/server/__tests__/basePath.js b/src/server/__tests__/basePath.js
index ec67b9fa538a6..21041c861d5ac 100644
--- a/src/server/__tests__/basePath.js
+++ b/src/server/__tests__/basePath.js
@@ -1,10 +1,8 @@
import { resolve } from 'path';
import { fromNode as fn } from 'bluebird';
import expect from 'expect.js';
-import requirefrom from 'requirefrom';
-const requireFromTest = requirefrom('test');
-const kbnTestServer = requireFromTest('utils/kbn_server');
+import kbnTestServer from '../../../test/utils/kbn_server';
const basePath = '/kibana';
describe('Server basePath config', function () {
diff --git a/src/server/config/config.js b/src/server/config/config.js
index 0cad7df89d9fe..6beff92f99c15 100644
--- a/src/server/config/config.js
+++ b/src/server/config/config.js
@@ -3,7 +3,7 @@ import Joi from 'joi';
import _ from 'lodash';
import override from './override';
import createDefaultSchema from './schema';
-let pkg = require('requirefrom')('src/utils')('packageJson');
+import pkg from '../../utils/packageJson';
import clone from './deepCloneWithBuffers';
import { zipObject } from 'lodash';
diff --git a/src/server/config/schema.js b/src/server/config/schema.js
index 010f06a33e053..6f000908579fc 100644
--- a/src/server/config/schema.js
+++ b/src/server/config/schema.js
@@ -4,8 +4,7 @@ import path from 'path';
import { get } from 'lodash';
import { randomBytes } from 'crypto';
-let utils = require('requirefrom')('src/utils');
-let fromRoot = utils('fromRoot');
+import fromRoot from '../../utils/fromRoot';
module.exports = () => Joi.object({
pkg: Joi.object({
diff --git a/src/server/http/__tests__/index.js b/src/server/http/__tests__/index.js
index c4d33bfe56149..509e9a751c0e2 100644
--- a/src/server/http/__tests__/index.js
+++ b/src/server/http/__tests__/index.js
@@ -1,8 +1,5 @@
import expect from 'expect.js';
-import requirefrom from 'requirefrom';
-
-const requireFromTest = requirefrom('test');
-const kbnTestServer = requireFromTest('utils/kbn_server');
+import kbnTestServer from '../../../../test/utils/kbn_server';
describe('cookie validation', function () {
let kbnServer;
diff --git a/src/server/http/__tests__/xsrf.js b/src/server/http/__tests__/xsrf.js
index fc7da5f941592..12676a2fde2a0 100644
--- a/src/server/http/__tests__/xsrf.js
+++ b/src/server/http/__tests__/xsrf.js
@@ -1,9 +1,7 @@
import expect from 'expect.js';
import { fromNode as fn } from 'bluebird';
import { resolve } from 'path';
-
-const requireFromTest = require('requirefrom')('test');
-const kbnTestServer = requireFromTest('utils/kbn_server');
+import kbnTestServer from '../../../../test/utils/kbn_server';
const nonDestructiveMethods = ['GET'];
const destructiveMethods = ['POST', 'PUT', 'DELETE'];
diff --git a/src/server/plugins/PluginCollection.js b/src/server/plugins/PluginCollection.js
index c3d57a73977ac..40cee339d910e 100644
--- a/src/server/plugins/PluginCollection.js
+++ b/src/server/plugins/PluginCollection.js
@@ -2,7 +2,7 @@
import PluginApi from './PluginApi';
import { inspect } from 'util';
import { get, indexBy } from 'lodash';
-let Collection = require('requirefrom')('src')('utils/Collection');
+import Collection from '../../utils/Collection';
let byIdCache = Symbol('byIdCache');
let pluginApis = Symbol('pluginApis');
diff --git a/src/ui/ui_app_collection.js b/src/ui/ui_app_collection.js
index a00d9646d557f..b39c8c57ea2f3 100644
--- a/src/ui/ui_app_collection.js
+++ b/src/ui/ui_app_collection.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
import UiApp from './ui_app';
-let Collection = require('requirefrom')('src')('utils/Collection');
+import Collection from '../utils/Collection';
let byIdCache = Symbol('byId');
diff --git a/tasks/config/babel.js b/tasks/config/babel.js
index 3e16bf5959be9..3ea329e6dbcd9 100644
--- a/tasks/config/babel.js
+++ b/tasks/config/babel.js
@@ -1,5 +1,5 @@
let { defaults } = require('lodash');
-let babelOptions = require('requirefrom')('src')('optimize/babelOptions');
+let babelOptions = require('../../src/optimize/babelOptions');
module.exports = {
build: {
diff --git a/tasks/config/esvm.js b/tasks/config/esvm.js
index 495c391ba7a03..89bf4115333b7 100644
--- a/tasks/config/esvm.js
+++ b/tasks/config/esvm.js
@@ -2,7 +2,7 @@ module.exports = function (grunt) {
var resolve = require('path').resolve;
var directory = resolve(__dirname, '../../esvm');
var dataDir = resolve(directory, 'data_dir');
- var uiConfig = require('requirefrom')('test')('serverConfig');
+ var uiConfig = require('../../test/serverConfig');
return {
options: {
diff --git a/test/utils/kbn_server.js b/test/utils/kbn_server.js
index 35a0bc3aa1c59..eb77401615dc3 100644
--- a/test/utils/kbn_server.js
+++ b/test/utils/kbn_server.js
@@ -1,11 +1,8 @@
import { defaultsDeep, set } from 'lodash';
-import requirefrom from 'requirefrom';
import { header as basicAuthHeader } from './base_auth';
import { kibanaUser, kibanaServer } from '../shield';
-
-const src = requirefrom('src');
-const KbnServer = src('server/KbnServer');
-const fromRoot = src('utils/fromRoot');
+import KbnServer from '../../src/server/KbnServer';
+import fromRoot from '../../src/utils/fromRoot';
const SERVER_DEFAULTS = {
server: {
From c1c8607f273db24260dc45e692247bbfa6f45cc0 Mon Sep 17 00:00:00 2001
From: spalger <spalger@users.noreply.github.com>
Date: Wed, 24 Feb 2016 13:36:12 -0800
Subject: [PATCH 04/12] [rename] process previously dynamic imports
---
src/cli/cli.js | 2 +-
src/cli/cluster/cluster_manager.js | 2 +-
src/cli/plugin/__tests__/setting_parser.js | 2 +-
src/cli/plugin/plugin.js | 2 +-
src/cli/plugin/plugin_installer.js | 2 +-
src/cli/serve/read_yaml_config.js | 2 +-
src/cli/serve/serve.js | 4 ++--
src/optimize/lazy/optmzr_role.js | 2 +-
src/plugins/elasticsearch/lib/__tests__/is_upgradeable.js | 2 +-
src/plugins/tests_bundle/index.js | 2 +-
src/server/config/config.js | 2 +-
src/server/config/schema.js | 2 +-
src/server/kbn_server.js | 4 ++--
src/server/plugins/plugin_collection.js | 2 +-
src/ui/ui_app_collection.js | 2 +-
tasks/config/babel.js | 2 +-
tasks/config/esvm.js | 2 +-
test/utils/kbn_server.js | 4 ++--
18 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/src/cli/cli.js b/src/cli/cli.js
index 9f040a8797e1a..0de588a87ab07 100644
--- a/src/cli/cli.js
+++ b/src/cli/cli.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
-import pkg from '../utils/packageJson';
+import pkg from '../utils/package_json';
import Command from './command';
let argv = process.env.kbnWorkerArgv ? JSON.parse(process.env.kbnWorkerArgv) : process.argv.slice();
diff --git a/src/cli/cluster/cluster_manager.js b/src/cli/cluster/cluster_manager.js
index 3e5f1618cc70b..e306760fa5325 100644
--- a/src/cli/cluster/cluster_manager.js
+++ b/src/cli/cluster/cluster_manager.js
@@ -83,7 +83,7 @@ module.exports = class ClusterManager {
setupWatching(extraPaths) {
const chokidar = require('chokidar');
- const fromRoot = require('../../utils/fromRoot');
+ const fromRoot = require('../../utils/from_root');
this.watcher = chokidar.watch([
'src/plugins',
diff --git a/src/cli/plugin/__tests__/setting_parser.js b/src/cli/plugin/__tests__/setting_parser.js
index 09cb0ddd9c3bb..bf47bd7c82c13 100644
--- a/src/cli/plugin/__tests__/setting_parser.js
+++ b/src/cli/plugin/__tests__/setting_parser.js
@@ -1,7 +1,7 @@
import path from 'path';
import expect from 'expect.js';
-import fromRoot from '../../../utils/fromRoot';
+import fromRoot from '../../../utils/from_root';
import settingParser from '../setting_parser';
describe('kibana cli', function () {
diff --git a/src/cli/plugin/plugin.js b/src/cli/plugin/plugin.js
index 5cf125775b804..390d2e48baeea 100644
--- a/src/cli/plugin/plugin.js
+++ b/src/cli/plugin/plugin.js
@@ -1,4 +1,4 @@
-import fromRoot from '../../utils/fromRoot';
+import fromRoot from '../../utils/from_root';
import settingParser from './setting_parser';
import installer from './plugin_installer';
import remover from './plugin_remover';
diff --git a/src/cli/plugin/plugin_installer.js b/src/cli/plugin/plugin_installer.js
index 43d750be2c5ef..f95dd6c37f739 100644
--- a/src/cli/plugin/plugin_installer.js
+++ b/src/cli/plugin/plugin_installer.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import fromRoot from '../../utils/fromRoot';
+import fromRoot from '../../utils/from_root';
import pluginDownloader from './plugin_downloader';
import pluginCleaner from './plugin_cleaner';
import pluginExtractor from './plugin_extractor';
diff --git a/src/cli/serve/read_yaml_config.js b/src/cli/serve/read_yaml_config.js
index 0c28635eddc76..8ef3acff942f4 100644
--- a/src/cli/serve/read_yaml_config.js
+++ b/src/cli/serve/read_yaml_config.js
@@ -2,7 +2,7 @@ import _ from 'lodash';
import fs from 'fs';
import yaml from 'js-yaml';
-import fromRoot from '../../utils/fromRoot';
+import fromRoot from '../../utils/from_root';
let legacySettingMap = {
// server
diff --git a/src/cli/serve/serve.js b/src/cli/serve/serve.js
index 675840b979fc5..eea4763bb31d7 100644
--- a/src/cli/serve/serve.js
+++ b/src/cli/serve/serve.js
@@ -3,7 +3,7 @@ const { isWorker } = require('cluster');
const { resolve } = require('path');
const cwd = process.cwd();
-import fromRoot from '../../utils/fromRoot';
+import fromRoot from '../../utils/from_root';
let canCluster;
try {
@@ -126,7 +126,7 @@ module.exports = function (program) {
}
let kbnServer = {};
- const KbnServer = require('../../server/KbnServer');
+ const KbnServer = require('../../server/kbn_server');
try {
kbnServer = new KbnServer(settings);
await kbnServer.ready();
diff --git a/src/optimize/lazy/optmzr_role.js b/src/optimize/lazy/optmzr_role.js
index b29aa9af57d70..152d8cf42e471 100644
--- a/src/optimize/lazy/optmzr_role.js
+++ b/src/optimize/lazy/optmzr_role.js
@@ -1,6 +1,6 @@
import LazyServer from './lazy_server';
import LazyOptimizer from './lazy_optimizer';
-import fromRoot from '../../utils/fromRoot';
+import fromRoot from '../../utils/from_root';
export default async (kbnServer, kibanaHapiServer, config) => {
let server = new LazyServer(
diff --git a/src/plugins/elasticsearch/lib/__tests__/is_upgradeable.js b/src/plugins/elasticsearch/lib/__tests__/is_upgradeable.js
index e64de8a89a07a..e46daa2c2fc08 100644
--- a/src/plugins/elasticsearch/lib/__tests__/is_upgradeable.js
+++ b/src/plugins/elasticsearch/lib/__tests__/is_upgradeable.js
@@ -3,7 +3,7 @@ import expect from 'expect.js';
import sinon from 'sinon';
import isUpgradeable from '../is_upgradeable';
-import pkg from '../../../../utils/packageJson';
+import pkg from '../../../../utils/package_json';
let version = pkg.version;
describe('plugins/elasticsearch', function () {
diff --git a/src/plugins/tests_bundle/index.js b/src/plugins/tests_bundle/index.js
index cdcb9c766e95e..3cfef22a9f06f 100644
--- a/src/plugins/tests_bundle/index.js
+++ b/src/plugins/tests_bundle/index.js
@@ -1,7 +1,7 @@
import { union } from 'lodash';
import findSourceFiles from './find_source_files';
-import fromRoot from '../../utils/fromRoot';
+import fromRoot from '../../utils/from_root';
export default (kibana) => {
return new kibana.Plugin({
diff --git a/src/server/config/config.js b/src/server/config/config.js
index e0c2cf23f34bb..0f601959ede06 100644
--- a/src/server/config/config.js
+++ b/src/server/config/config.js
@@ -3,7 +3,7 @@ import Joi from 'joi';
import _ from 'lodash';
import override from './override';
import createDefaultSchema from './schema';
-import pkg from '../../utils/packageJson';
+import pkg from '../../utils/package_json';
import clone from './deep_clone_with_buffers';
import { zipObject } from 'lodash';
diff --git a/src/server/config/schema.js b/src/server/config/schema.js
index 6f000908579fc..e0f0c95765700 100644
--- a/src/server/config/schema.js
+++ b/src/server/config/schema.js
@@ -4,7 +4,7 @@ import path from 'path';
import { get } from 'lodash';
import { randomBytes } from 'crypto';
-import fromRoot from '../../utils/fromRoot';
+import fromRoot from '../../utils/from_root';
module.exports = () => Joi.object({
pkg: Joi.object({
diff --git a/src/server/kbn_server.js b/src/server/kbn_server.js
index 37ab022368b20..d42554026b21f 100644
--- a/src/server/kbn_server.js
+++ b/src/server/kbn_server.js
@@ -1,8 +1,8 @@
import Hapi from 'hapi';
import { constant, once, compact, flatten } from 'lodash';
import { promisify, resolve, fromNode } from 'bluebird';
-import fromRoot from '../utils/fromRoot';
-import pkg from '../utils/packageJson';
+import fromRoot from '../utils/from_root';
+import pkg from '../utils/package_json';
let rootDir = fromRoot('.');
diff --git a/src/server/plugins/plugin_collection.js b/src/server/plugins/plugin_collection.js
index 57675e277d79b..6019fd3baf60b 100644
--- a/src/server/plugins/plugin_collection.js
+++ b/src/server/plugins/plugin_collection.js
@@ -2,7 +2,7 @@
import PluginApi from './plugin_api';
import { inspect } from 'util';
import { get, indexBy } from 'lodash';
-import Collection from '../../utils/Collection';
+import Collection from '../../utils/collection';
let byIdCache = Symbol('byIdCache');
let pluginApis = Symbol('pluginApis');
diff --git a/src/ui/ui_app_collection.js b/src/ui/ui_app_collection.js
index b39c8c57ea2f3..65aabb84023c0 100644
--- a/src/ui/ui_app_collection.js
+++ b/src/ui/ui_app_collection.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
import UiApp from './ui_app';
-import Collection from '../utils/Collection';
+import Collection from '../utils/collection';
let byIdCache = Symbol('byId');
diff --git a/tasks/config/babel.js b/tasks/config/babel.js
index 3ea329e6dbcd9..5eac966fcf6c3 100644
--- a/tasks/config/babel.js
+++ b/tasks/config/babel.js
@@ -1,5 +1,5 @@
let { defaults } = require('lodash');
-let babelOptions = require('../../src/optimize/babelOptions');
+let babelOptions = require('../../src/optimize/babel_options');
module.exports = {
build: {
diff --git a/tasks/config/esvm.js b/tasks/config/esvm.js
index 89bf4115333b7..3295cd215adb7 100644
--- a/tasks/config/esvm.js
+++ b/tasks/config/esvm.js
@@ -2,7 +2,7 @@ module.exports = function (grunt) {
var resolve = require('path').resolve;
var directory = resolve(__dirname, '../../esvm');
var dataDir = resolve(directory, 'data_dir');
- var uiConfig = require('../../test/serverConfig');
+ var uiConfig = require('../../test/server_config');
return {
options: {
diff --git a/test/utils/kbn_server.js b/test/utils/kbn_server.js
index eb77401615dc3..15d015503280d 100644
--- a/test/utils/kbn_server.js
+++ b/test/utils/kbn_server.js
@@ -1,8 +1,8 @@
import { defaultsDeep, set } from 'lodash';
import { header as basicAuthHeader } from './base_auth';
import { kibanaUser, kibanaServer } from '../shield';
-import KbnServer from '../../src/server/KbnServer';
-import fromRoot from '../../src/utils/fromRoot';
+import KbnServer from '../../src/server/kbn_server';
+import fromRoot from '../../src/utils/from_root';
const SERVER_DEFAULTS = {
server: {
From af9ebba958c0726f3120af9bb336417d98de5f21 Mon Sep 17 00:00:00 2001
From: spalger <spalger@users.noreply.github.com>
Date: Wed, 24 Feb 2016 13:49:43 -0800
Subject: [PATCH 05/12] [rename] hunt down remaining non-snake path refs
---
Gruntfile.js | 2 +-
src/plugins/dev_mode/index.js | 2 +-
.../elasticsearch/lib/__tests__/is_upgradeable.js | 2 +-
src/plugins/elasticsearch/lib/__tests__/routes.js | 2 +-
src/plugins/spy_modes/index.js | 4 ++--
src/plugins/status_page/index.js | 2 +-
src/plugins/tests_bundle/index.js | 2 +-
src/server/__tests__/base_path.js | 2 +-
src/server/http/__tests__/index.js | 2 +-
src/server/http/__tests__/xsrf.js | 2 +-
src/server/http/index.js | 2 +-
src/ui/public/directives/validate_ip.js | 2 +-
src/ui/public/routes/__tests__/_route_manager.js | 2 +-
.../public/{testHarness => test_harness}/.eslintrc | 0
.../__tests__/{ipv4Address.js => ipv4_address.js} | 2 +-
src/ui/public/utils/cidr_mask.js | 2 +-
.../public/utils/{ipv4Address.js => ipv4_address.js} | 0
src/ui/ui_bundler_env.js | 2 +-
tasks/build/babel_options.js | 4 ++--
tasks/config/intern.js | 2 +-
tasks/config/run.js | 2 +-
test/fixtures/config.js | 12 ++++++------
test/intern.js | 2 +-
test/support/pages/common.js | 2 +-
test/unit/api/ingest/index.js | 2 +-
webpackShims/jquery.js | 2 +-
26 files changed, 31 insertions(+), 31 deletions(-)
rename src/ui/public/{testHarness => test_harness}/.eslintrc (100%)
rename src/ui/public/utils/__tests__/{ipv4Address.js => ipv4_address.js} (96%)
rename src/ui/public/utils/{ipv4Address.js => ipv4_address.js} (100%)
diff --git a/Gruntfile.js b/Gruntfile.js
index 48d88d97ef8c2..4a632b941a2f6 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,4 +1,4 @@
-require('babel/register')(require('./src/optimize/babelOptions').node);
+require('babel/register')(require('./src/optimize/babel_options').node);
module.exports = function (grunt) {
// set the config once before calling load-grunt-config
diff --git a/src/plugins/dev_mode/index.js b/src/plugins/dev_mode/index.js
index 256667bb21743..6e54e0e9c7916 100644
--- a/src/plugins/dev_mode/index.js
+++ b/src/plugins/dev_mode/index.js
@@ -3,7 +3,7 @@ module.exports = (kibana) => {
return new kibana.Plugin({
uiExports: {
spyModes: [
- 'plugins/devMode/visDebugSpyPanel'
+ 'plugins/dev_mode/vis_debug_spy_panel'
]
}
});
diff --git a/src/plugins/elasticsearch/lib/__tests__/is_upgradeable.js b/src/plugins/elasticsearch/lib/__tests__/is_upgradeable.js
index e46daa2c2fc08..bc527560acf57 100644
--- a/src/plugins/elasticsearch/lib/__tests__/is_upgradeable.js
+++ b/src/plugins/elasticsearch/lib/__tests__/is_upgradeable.js
@@ -7,7 +7,7 @@ import pkg from '../../../../utils/package_json';
let version = pkg.version;
describe('plugins/elasticsearch', function () {
- describe('lib/isUpgradeable', function () {
+ describe('lib/is_upgradeable', function () {
let server = {
config: _.constant({
get: function (key) {
diff --git a/src/plugins/elasticsearch/lib/__tests__/routes.js b/src/plugins/elasticsearch/lib/__tests__/routes.js
index 2d88e49aea4f0..53e5971c4e1ee 100644
--- a/src/plugins/elasticsearch/lib/__tests__/routes.js
+++ b/src/plugins/elasticsearch/lib/__tests__/routes.js
@@ -1,6 +1,6 @@
import expect from 'expect.js';
import util from 'util';
-import kbnTestServer from '../../../../../test/utils/kbn_server';
+import * as kbnTestServer from '../../../../../test/utils/kbn_server';
const format = util.format;
diff --git a/src/plugins/spy_modes/index.js b/src/plugins/spy_modes/index.js
index cbcc86e2012da..83ca9f1880035 100644
--- a/src/plugins/spy_modes/index.js
+++ b/src/plugins/spy_modes/index.js
@@ -2,8 +2,8 @@ module.exports = function (kibana) {
return new kibana.Plugin({
uiExports: {
spyModes: [
- 'plugins/spyModes/tableSpyMode',
- 'plugins/spyModes/reqRespStatsSpyMode'
+ 'plugins/spy_modes/table_spy_mode',
+ 'plugins/spy_modes/req_resp_stats_spy_mode'
]
}
});
diff --git a/src/plugins/status_page/index.js b/src/plugins/status_page/index.js
index 1807813438ab9..d7e7649f9d492 100644
--- a/src/plugins/status_page/index.js
+++ b/src/plugins/status_page/index.js
@@ -3,7 +3,7 @@ module.exports = function (kibana) {
uiExports: {
app: {
title: 'Server Status',
- main: 'plugins/statusPage/statusPage',
+ main: 'plugins/status_page/status_page',
hidden: true,
url: '/status'
}
diff --git a/src/plugins/tests_bundle/index.js b/src/plugins/tests_bundle/index.js
index 3cfef22a9f06f..5839767959b90 100644
--- a/src/plugins/tests_bundle/index.js
+++ b/src/plugins/tests_bundle/index.js
@@ -66,7 +66,7 @@ export default (kibana) => {
},
modules: {
- ngMock$: fromRoot('src/plugins/devMode/public/ngMock'),
+ ngMock$: fromRoot('src/plugins/dev_mode/public/ngMock'),
fixtures: fromRoot('src/fixtures'),
test_utils: fromRoot('src/test_utils'),
'angular-mocks': {
diff --git a/src/server/__tests__/base_path.js b/src/server/__tests__/base_path.js
index 21041c861d5ac..fde7ec98f128a 100644
--- a/src/server/__tests__/base_path.js
+++ b/src/server/__tests__/base_path.js
@@ -2,7 +2,7 @@ import { resolve } from 'path';
import { fromNode as fn } from 'bluebird';
import expect from 'expect.js';
-import kbnTestServer from '../../../test/utils/kbn_server';
+import * as kbnTestServer from '../../../test/utils/kbn_server';
const basePath = '/kibana';
describe('Server basePath config', function () {
diff --git a/src/server/http/__tests__/index.js b/src/server/http/__tests__/index.js
index 509e9a751c0e2..3d2ac386b13f9 100644
--- a/src/server/http/__tests__/index.js
+++ b/src/server/http/__tests__/index.js
@@ -1,5 +1,5 @@
import expect from 'expect.js';
-import kbnTestServer from '../../../../test/utils/kbn_server';
+import * as kbnTestServer from '../../../../test/utils/kbn_server';
describe('cookie validation', function () {
let kbnServer;
diff --git a/src/server/http/__tests__/xsrf.js b/src/server/http/__tests__/xsrf.js
index 12676a2fde2a0..61924aa62a726 100644
--- a/src/server/http/__tests__/xsrf.js
+++ b/src/server/http/__tests__/xsrf.js
@@ -1,7 +1,7 @@
import expect from 'expect.js';
import { fromNode as fn } from 'bluebird';
import { resolve } from 'path';
-import kbnTestServer from '../../../../test/utils/kbn_server';
+import * as kbnTestServer from '../../../../test/utils/kbn_server';
const nonDestructiveMethods = ['GET'];
const destructiveMethods = ['POST', 'PUT', 'DELETE'];
diff --git a/src/server/http/index.js b/src/server/http/index.js
index 275cbb00e919e..94b0d48c594c5 100644
--- a/src/server/http/index.js
+++ b/src/server/http/index.js
@@ -82,7 +82,7 @@ module.exports = async function (kbnServer, server, config) {
path: '/',
method: 'GET',
handler: function (req, reply) {
- return reply.view('rootRedirect', {
+ return reply.view('root_redirect', {
hashRoute: `${config.get('server.basePath')}/app/kibana`,
defaultRoute: getDefaultRoute(kbnServer),
});
diff --git a/src/ui/public/directives/validate_ip.js b/src/ui/public/directives/validate_ip.js
index 9f12601288c99..9b639ae63e404 100644
--- a/src/ui/public/directives/validate_ip.js
+++ b/src/ui/public/directives/validate_ip.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import Ipv4Address from 'ui/utils/ipv4Address';
+import Ipv4Address from 'ui/utils/ipv4_address';
import uiModules from 'ui/modules';
uiModules
diff --git a/src/ui/public/routes/__tests__/_route_manager.js b/src/ui/public/routes/__tests__/_route_manager.js
index a56a410500dcf..f1178bc144f3e 100644
--- a/src/ui/public/routes/__tests__/_route_manager.js
+++ b/src/ui/public/routes/__tests__/_route_manager.js
@@ -12,7 +12,7 @@ var chainableMethods = [
];
var $rp;
-describe('routes/RouteManager', function () {
+describe('routes/route_manager', function () {
beforeEach(ngMock.module('kibana', function ($routeProvider) {
$rp = $routeProvider;
sinon.stub($rp, 'otherwise');
diff --git a/src/ui/public/testHarness/.eslintrc b/src/ui/public/test_harness/.eslintrc
similarity index 100%
rename from src/ui/public/testHarness/.eslintrc
rename to src/ui/public/test_harness/.eslintrc
diff --git a/src/ui/public/utils/__tests__/ipv4Address.js b/src/ui/public/utils/__tests__/ipv4_address.js
similarity index 96%
rename from src/ui/public/utils/__tests__/ipv4Address.js
rename to src/ui/public/utils/__tests__/ipv4_address.js
index b263fca311e29..6d37383fe63a5 100644
--- a/src/ui/public/utils/__tests__/ipv4Address.js
+++ b/src/ui/public/utils/__tests__/ipv4_address.js
@@ -1,4 +1,4 @@
-import Ipv4Address from 'ui/utils/ipv4Address';
+import Ipv4Address from 'ui/utils/ipv4_address';
import expect from 'expect.js';
describe('Ipv4Address', function () {
diff --git a/src/ui/public/utils/cidr_mask.js b/src/ui/public/utils/cidr_mask.js
index db6f62b677b21..88e3e5f27fc9e 100644
--- a/src/ui/public/utils/cidr_mask.js
+++ b/src/ui/public/utils/cidr_mask.js
@@ -1,4 +1,4 @@
-import Ipv4Address from 'ui/utils/ipv4Address';
+import Ipv4Address from 'ui/utils/ipv4_address';
var NUM_BITS = 32;
function throwError(mask) {
diff --git a/src/ui/public/utils/ipv4Address.js b/src/ui/public/utils/ipv4_address.js
similarity index 100%
rename from src/ui/public/utils/ipv4Address.js
rename to src/ui/public/utils/ipv4_address.js
diff --git a/src/ui/ui_bundler_env.js b/src/ui/ui_bundler_env.js
index 96bdf699aec3a..80ff9f0a42285 100644
--- a/src/ui/ui_bundler_env.js
+++ b/src/ui/ui_bundler_env.js
@@ -46,7 +46,7 @@ module.exports = class UiBundlerEnv {
// webpack aliases, like require paths, mapping a prefix to a directory
this.aliases = {
ui: fromRoot('src/ui/public'),
- testHarness: fromRoot('src/testHarness/public')
+ test_harness: fromRoot('src/test_harness/public')
};
// map of which plugins created which aliases
diff --git a/tasks/build/babel_options.js b/tasks/build/babel_options.js
index 2e3f52c021eaa..586e3cedd0e3a 100644
--- a/tasks/build/babel_options.js
+++ b/tasks/build/babel_options.js
@@ -1,7 +1,7 @@
module.exports = function (grunt) {
- var srcFile = 'build/kibana/src/optimize/babelOptions.js';
- var buildFile = 'build/kibana/src/optimize/babelOptions.build.js';
+ var srcFile = 'build/kibana/src/optimize/babel_options.js';
+ var buildFile = 'build/kibana/src/optimize/babel_options.build.js';
var rename = require('fs').renameSync;
var unlink = require('fs').unlinkSync;
diff --git a/tasks/config/intern.js b/tasks/config/intern.js
index d1f2ee96ab42f..cfe96661c18e3 100644
--- a/tasks/config/intern.js
+++ b/tasks/config/intern.js
@@ -12,7 +12,7 @@ module.exports = function (grunt) {
api: {
options: {
runType: 'client',
- config: 'test/apiIntern'
+ config: 'test/api_intern'
}
}
};
diff --git a/tasks/config/run.js b/tasks/config/run.js
index 0d0be286c465c..126de64dc4016 100644
--- a/tasks/config/run.js
+++ b/tasks/config/run.js
@@ -4,7 +4,7 @@ module.exports = function (grunt) {
let {resolve} = require('path');
let root = p => resolve(__dirname, '../../', p);
let binScript = /^win/.test(platform) ? '.\\bin\\kibana.bat' : './bin/kibana';
- let uiConfig = require(root('test/serverConfig'));
+ let uiConfig = require(root('test/server_config'));
const stdDevArgs = [
'--env.name=development',
diff --git a/test/fixtures/config.js b/test/fixtures/config.js
index acc692fb0cd4f..ffe2862492c18 100644
--- a/test/fixtures/config.js
+++ b/test/fixtures/config.js
@@ -7,11 +7,11 @@ module.exports = {
baseDir: path.join(rootDir, 'makelogs'),
bulk: [{
indexName: 'logstash-2015.09.17',
- indexDefinition: 'makelogsIndexDefinition.js',
+ indexDefinition: 'makelogs_index_definition.js',
source: 'logstash-2015.09.17.js'
}, {
indexName: 'logstash-2015.09.18',
- indexDefinition: 'makelogsIndexDefinition.js',
+ indexDefinition: 'makelogs_index_definition.js',
source: 'logstash-2015.09.18.js'
}]
},
@@ -19,7 +19,7 @@ module.exports = {
baseDir: path.join(rootDir, 'emptyKibana'),
bulk: [{
indexName: '.kibana',
- indexDefinition: 'kibanaDefinition.js',
+ indexDefinition: 'kibana_definition.js',
source: 'kibana.js',
haltOnFailure: false
}]
@@ -27,15 +27,15 @@ module.exports = {
logstashFunctional: {
baseDir: path.join(rootDir, 'logstashFunctional'),
bulk: [{
- indexDefinition: 'makelogsIndexDefinition.js',
+ indexDefinition: 'makelogs_index_definition.js',
indexName: 'logstash-2015.09.20',
source: 'logstash-2015.09.20.js'
}, {
- indexDefinition: 'makelogsIndexDefinition.js',
+ indexDefinition: 'makelogs_index_definition.js',
indexName: 'logstash-2015.09.21',
source: 'logstash-2015.09.21.js'
}, {
- indexDefinition: 'makelogsIndexDefinition.js',
+ indexDefinition: 'makelogs_index_definition.js',
indexName: 'logstash-2015.09.22',
source: 'logstash-2015.09.22.js'
}]
diff --git a/test/intern.js b/test/intern.js
index 67af1e763229e..39c9d958cc9d3 100644
--- a/test/intern.js
+++ b/test/intern.js
@@ -1,5 +1,5 @@
define(function (require) {
- var serverConfig = require('intern/dojo/node!./serverConfig');
+ var serverConfig = require('intern/dojo/node!./server_config');
var _ = require('intern/dojo/node!lodash');
return _.assign({
diff --git a/test/support/pages/common.js b/test/support/pages/common.js
index 60212a0c9982e..4438bf770076e 100644
--- a/test/support/pages/common.js
+++ b/test/support/pages/common.js
@@ -4,7 +4,7 @@ define(function (require) {
var Promise = require('bluebird');
var moment = require('moment');
var testSubjSelector = require('intern/dojo/node!@spalger/test-subj-selector');
- var getUrl = require('intern/dojo/node!../../utils/getUrl');
+ var getUrl = require('intern/dojo/node!../../utils/get_url');
var fs = require('intern/dojo/node!fs');
var _ = require('intern/dojo/node!lodash');
var parse = require('intern/dojo/node!url').parse;
diff --git a/test/unit/api/ingest/index.js b/test/unit/api/ingest/index.js
index dfecb12512c58..680b63c31819b 100644
--- a/test/unit/api/ingest/index.js
+++ b/test/unit/api/ingest/index.js
@@ -1,6 +1,6 @@
define(function (require) {
var bdd = require('intern!bdd');
- var serverConfig = require('intern/dojo/node!../../../serverConfig');
+ var serverConfig = require('intern/dojo/node!../../../server_config');
var ScenarioManager = require('intern/dojo/node!../../../fixtures/scenario_manager');
var request = require('intern/dojo/node!supertest-as-promised');
var url = require('intern/dojo/node!url');
diff --git a/webpackShims/jquery.js b/webpackShims/jquery.js
index e9ac7b7cbfdad..7e6a2549ffd7a 100644
--- a/webpackShims/jquery.js
+++ b/webpackShims/jquery.js
@@ -1,2 +1,2 @@
var $ = window.jQuery = window.$ = module.exports = require('node_modules/jquery/dist/jquery');
-require('ui/jquery/findTestSubject')($);
+require('ui/jquery/find_test_subject')($);
From 36cdae8281b9065bb050a3d823efaef3cf23e2b8 Mon Sep 17 00:00:00 2001
From: spalger <spalger@users.noreply.github.com>
Date: Thu, 25 Feb 2016 17:25:33 -0700
Subject: [PATCH 06/12] [plugins] change plugin ids to be snakecase
---
src/plugins/dev_mode/package.json | 2 +-
src/plugins/spy_modes/package.json | 2 +-
src/plugins/status_page/package.json | 2 +-
src/plugins/tests_bundle/index.js | 4 ++--
src/plugins/tests_bundle/package.json | 2 +-
src/server/status/index.js | 2 +-
tasks/config/run.js | 2 +-
test/functional/status_page/index.js | 4 ++--
8 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/plugins/dev_mode/package.json b/src/plugins/dev_mode/package.json
index 0d52e00a9094c..666d9a81a6a70 100644
--- a/src/plugins/dev_mode/package.json
+++ b/src/plugins/dev_mode/package.json
@@ -1,4 +1,4 @@
{
- "name": "devMode",
+ "name": "dev_mode",
"version": "1.0.0"
}
diff --git a/src/plugins/spy_modes/package.json b/src/plugins/spy_modes/package.json
index e5f8c52a1f4a8..8bf42bfa865a7 100644
--- a/src/plugins/spy_modes/package.json
+++ b/src/plugins/spy_modes/package.json
@@ -1,4 +1,4 @@
{
- "name": "spyModes",
+ "name": "spy_modes",
"version": "1.0.0"
}
diff --git a/src/plugins/status_page/package.json b/src/plugins/status_page/package.json
index 853b935ec57e9..551751fda01ca 100644
--- a/src/plugins/status_page/package.json
+++ b/src/plugins/status_page/package.json
@@ -1,4 +1,4 @@
{
- "name": "statusPage",
+ "name": "status_page",
"version": "1.0.0"
}
diff --git a/src/plugins/tests_bundle/index.js b/src/plugins/tests_bundle/index.js
index 5839767959b90..b0ce3446f3b46 100644
--- a/src/plugins/tests_bundle/index.js
+++ b/src/plugins/tests_bundle/index.js
@@ -19,7 +19,7 @@ export default (kibana) => {
let config = kibana.config;
const testGlobs = ['src/ui/public/**/*.js'];
- const testingPluginId = config.get('testsBundle.pluginId');
+ const testingPluginId = config.get('tests_bundle.pluginId');
if (testingPluginId) {
const plugin = plugins.byId[testingPluginId];
@@ -49,7 +49,7 @@ export default (kibana) => {
const testFiles = await findSourceFiles(testGlobs);
for (let f of testFiles) modules.push(f);
- if (config.get('testsBundle.instrument')) {
+ if (config.get('tests_bundle.instrument')) {
env.addPostLoader({
test: /\.jsx?$/,
exclude: /[\/\\](__tests__|node_modules|bower_components|webpackShims)[\/\\]/,
diff --git a/src/plugins/tests_bundle/package.json b/src/plugins/tests_bundle/package.json
index 0b7104a0c3f34..dd351b09560c4 100644
--- a/src/plugins/tests_bundle/package.json
+++ b/src/plugins/tests_bundle/package.json
@@ -1,4 +1,4 @@
{
- "name": "testsBundle",
+ "name": "tests_bundle",
"version": "0.0.0"
}
diff --git a/src/server/status/index.js b/src/server/status/index.js
index 57284adee1b3b..c2d73d1c823a5 100644
--- a/src/server/status/index.js
+++ b/src/server/status/index.js
@@ -21,7 +21,7 @@ module.exports = function (kbnServer, server, config) {
});
server.decorate('reply', 'renderStatusPage', function () {
- var app = kbnServer.uiExports.getHiddenApp('statusPage');
+ var app = kbnServer.uiExports.getHiddenApp('status_page');
var resp = app ? this.renderApp(app) : this(kbnServer.status.toString());
resp.code(kbnServer.status.isGreen() ? 200 : 503);
return resp;
diff --git a/tasks/config/run.js b/tasks/config/run.js
index 126de64dc4016..36f166b5477b5 100644
--- a/tasks/config/run.js
+++ b/tasks/config/run.js
@@ -86,7 +86,7 @@ module.exports = function (grunt) {
args: [
...buildTestsArgs,
'--server.port=5610',
- '--testsBundle.instrument=true',
+ '--tests_bundle.instrument=true',
...kbnServerFlags,
]
},
diff --git a/test/functional/status_page/index.js b/test/functional/status_page/index.js
index c5bff5ff7c9e7..b4b27607bc03a 100644
--- a/test/functional/status_page/index.js
+++ b/test/functional/status_page/index.js
@@ -10,7 +10,7 @@ define(function (require) {
bdd.before(function () {
common = new Common(this.remote);
// load the status page
- return common.navigateToApp('statusPage', false);
+ return common.navigateToApp('status_page', false);
});
bdd.it('should show the kibana plugin as ready', function () {
@@ -27,4 +27,4 @@ define(function (require) {
.catch(common.handleError(self));
});
});
-});
\ No newline at end of file
+});
From 07e20936b59358b222e0b3308f1042772d1581f5 Mon Sep 17 00:00:00 2001
From: spalger <spalger@users.noreply.github.com>
Date: Mon, 7 Mar 2016 14:38:49 -0700
Subject: [PATCH 07/12] [grunt/config] rename config for snake_cased tasks
---
Gruntfile.js | 11 +++++++++++
package.json | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/Gruntfile.js b/Gruntfile.js
index 4a632b941a2f6..a0be7e3b42934 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,3 +1,4 @@
+var camelCase = require('lodash').camelCase;
require('babel/register')(require('./src/optimize/babel_options').node);
module.exports = function (grunt) {
@@ -81,6 +82,16 @@ module.exports = function (grunt) {
config: config,
loadGruntTasks: {
pattern: ['grunt-*', '@*/grunt-*', 'gruntify-*', '@*/gruntify-*', 'intern']
+ },
+ preMerge(config, data) {
+ Object.keys(config).forEach(key => {
+ const camelKey = camelCase(key);
+ if (key !== camelKey) {
+ grunt.log.debug(`renaming config for ${key} to ${camelKey}`);
+ config[camelKey] = config[key];
+ delete config[key];
+ }
+ });
}
});
diff --git a/package.json b/package.json
index bc713698ef02f..b7bac7f866669 100644
--- a/package.json
+++ b/package.json
@@ -176,7 +176,7 @@
"karma-safari-launcher": "0.1.1",
"libesvm": "3.3.0",
"license-checker": "3.1.0",
- "load-grunt-config": "0.7.2",
+ "load-grunt-config": "0.19.1",
"makelogs": "3.0.0-beta3",
"marked-text-renderer": "0.1.0",
"mocha": "2.3.0",
From 4fe8bbaeb8b6696da3dc7c0fff3055ab03d82fad Mon Sep 17 00:00:00 2001
From: spalger <spalger@users.noreply.github.com>
Date: Mon, 7 Mar 2016 15:11:11 -0700
Subject: [PATCH 08/12] [scenarioManager] snake_case baseDirs for scenarios
---
test/fixtures/config.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/test/fixtures/config.js b/test/fixtures/config.js
index ffe2862492c18..b9acf71b8e1cc 100644
--- a/test/fixtures/config.js
+++ b/test/fixtures/config.js
@@ -16,7 +16,7 @@ module.exports = {
}]
},
emptyKibana: {
- baseDir: path.join(rootDir, 'emptyKibana'),
+ baseDir: path.join(rootDir, 'empty_kibana'),
bulk: [{
indexName: '.kibana',
indexDefinition: 'kibana_definition.js',
@@ -25,7 +25,7 @@ module.exports = {
}]
},
logstashFunctional: {
- baseDir: path.join(rootDir, 'logstashFunctional'),
+ baseDir: path.join(rootDir, 'logstash_functional'),
bulk: [{
indexDefinition: 'makelogs_index_definition.js',
indexName: 'logstash-2015.09.20',
From 8358ca43567698e8fab770b09fe7705e15c59448 Mon Sep 17 00:00:00 2001
From: spalger <spalger@users.noreply.github.com>
Date: Mon, 7 Mar 2016 15:48:06 -0700
Subject: [PATCH 09/12] [test] ngMock -> ng_mock
---
src/plugins/kbn_doc_views/public/__tests__/doc_views.js | 2 +-
.../public/discover/__tests__/directives/discover_field.js | 2 +-
.../public/discover/__tests__/directives/field_calculator.js | 2 +-
.../public/discover/__tests__/directives/field_chooser.js | 2 +-
src/plugins/kibana/public/discover/__tests__/hit_sort_fn.js | 2 +-
src/plugins/kibana/public/doc/__tests__/doc.js | 2 +-
src/plugins/kibana/public/visualize/editor/__tests__/agg.js | 2 +-
.../markdown_vis/public/__tests__/markdown_vis_controller.js | 2 +-
.../metric_vis/public/__tests__/metric_vis_controller.js | 2 +-
src/plugins/table_vis/public/__tests__/_table_vis.js | 2 +-
src/plugins/table_vis/public/__tests__/_table_vis_controller.js | 2 +-
src/plugins/tests_bundle/index.js | 2 +-
src/ui/public/agg_response/geo_json/__tests__/geo_json.js | 2 +-
.../hierarchical/__tests__/build_hierarchical_data.js | 2 +-
.../agg_response/hierarchical/__tests__/create_raw_data.js | 2 +-
.../hierarchical/__tests__/transform_aggregation.js | 2 +-
.../public/agg_response/point_series/__tests__/_add_to_siri.js | 2 +-
.../agg_response/point_series/__tests__/_fake_x_aspect.js | 2 +-
.../public/agg_response/point_series/__tests__/_get_aspects.js | 2 +-
src/ui/public/agg_response/point_series/__tests__/_get_point.js | 2 +-
.../public/agg_response/point_series/__tests__/_get_series.js | 2 +-
.../public/agg_response/point_series/__tests__/_init_x_axis.js | 2 +-
.../public/agg_response/point_series/__tests__/_init_y_axis.js | 2 +-
src/ui/public/agg_response/point_series/__tests__/_main.js | 2 +-
.../agg_response/point_series/__tests__/_ordered_date_axis.js | 2 +-
.../agg_response/point_series/__tests__/_tooltip_formatter.js | 2 +-
src/ui/public/agg_response/tabify/__tests__/_buckets.js | 2 +-
src/ui/public/agg_response/tabify/__tests__/_get_columns.js | 2 +-
src/ui/public/agg_response/tabify/__tests__/_integration.js | 2 +-
src/ui/public/agg_response/tabify/__tests__/_response_writer.js | 2 +-
src/ui/public/agg_response/tabify/__tests__/_table.js | 2 +-
src/ui/public/agg_response/tabify/__tests__/_table_group.js | 2 +-
src/ui/public/agg_table/__tests__/_group.js | 2 +-
src/ui/public/agg_table/__tests__/_table.js | 2 +-
src/ui/public/agg_types/__tests__/agg_params.js | 2 +-
src/ui/public/agg_types/__tests__/agg_type.js | 2 +-
src/ui/public/agg_types/__tests__/bucket_count_between.js | 2 +-
src/ui/public/agg_types/__tests__/buckets/_histogram.js | 2 +-
src/ui/public/agg_types/__tests__/buckets/_range.js | 2 +-
.../agg_types/__tests__/buckets/create_filter/date_histogram.js | 2 +-
.../agg_types/__tests__/buckets/create_filter/date_range.js | 2 +-
.../public/agg_types/__tests__/buckets/create_filter/filters.js | 2 +-
.../agg_types/__tests__/buckets/create_filter/histogram.js | 2 +-
.../agg_types/__tests__/buckets/create_filter/ip_range.js | 2 +-
.../public/agg_types/__tests__/buckets/create_filter/range.js | 2 +-
.../public/agg_types/__tests__/buckets/create_filter/terms.js | 2 +-
.../agg_types/__tests__/buckets/date_histogram/_editor.js | 2 +-
.../agg_types/__tests__/buckets/date_histogram/_params.js | 2 +-
src/ui/public/agg_types/__tests__/controls/number_list.js | 2 +-
src/ui/public/agg_types/__tests__/index.js | 2 +-
.../agg_types/__tests__/param_types/_calculate_interval.js | 2 +-
src/ui/public/agg_types/__tests__/param_types/_field.js | 2 +-
src/ui/public/agg_types/__tests__/param_types/_optioned.js | 2 +-
src/ui/public/agg_types/__tests__/param_types/_raw_json.js | 2 +-
src/ui/public/agg_types/__tests__/param_types/_regex.js | 2 +-
src/ui/public/agg_types/__tests__/param_types/_string.js | 2 +-
src/ui/public/bind/__tests__/bind.js | 2 +-
src/ui/public/binder/__tests__/binder.js | 2 +-
src/ui/public/chrome/__tests__/nav_controls.js | 2 +-
src/ui/public/chrome/api/__tests__/xsrf.js | 2 +-
.../chrome/directives/app_switcher/__tests__/app_switcher.js | 2 +-
src/ui/public/config/__tests__/config.js | 2 +-
src/ui/public/courier/__tests__/request_queue.js | 2 +-
src/ui/public/courier/data_source/__tests__/decorate_query.js | 2 +-
src/ui/public/courier/data_source/__tests__/doc_source.js | 2 +-
.../courier/data_source/__tests__/normalize_sort_request.js | 2 +-
src/ui/public/courier/data_source/__tests__/search_source.js | 2 +-
src/ui/public/courier/fetch/__tests__/doc.js | 2 +-
src/ui/public/courier/fetch/__tests__/fetch.js | 2 +-
src/ui/public/courier/fetch/__tests__/fetch_these.js | 2 +-
src/ui/public/courier/fetch/request/__tests__/segmented.js | 2 +-
.../courier/fetch/request/__tests__/segmented_create_queue.js | 2 +-
.../fetch/request/__tests__/segmented_index_selection.js | 2 +-
.../courier/fetch/request/__tests__/segmented_size_picking.js | 2 +-
src/ui/public/courier/fetch/strategy/__tests__/search.js | 2 +-
src/ui/public/debounce/__tests__/debounce.js | 2 +-
src/ui/public/directives/__tests__/auto_select_if_only_one.js | 2 +-
src/ui/public/directives/__tests__/config.js | 2 +-
src/ui/public/directives/__tests__/confirm-click.js | 2 +-
src/ui/public/directives/__tests__/css_truncate.js | 2 +-
src/ui/public/directives/__tests__/fixed_scroll.js | 2 +-
src/ui/public/directives/__tests__/inequality.js | 2 +-
src/ui/public/directives/__tests__/input_focus.js | 2 +-
src/ui/public/directives/__tests__/input_whole_number.js | 2 +-
src/ui/public/directives/__tests__/json_input.js | 2 +-
src/ui/public/directives/__tests__/parse_query.js | 2 +-
src/ui/public/directives/__tests__/spinner.js | 2 +-
src/ui/public/directives/__tests__/timepicker.js | 2 +-
src/ui/public/directives/__tests__/truncate.js | 2 +-
src/ui/public/directives/__tests__/typeahead.js | 2 +-
src/ui/public/directives/__tests__/validate_cidr_mask.js | 2 +-
src/ui/public/directives/__tests__/validate_date_math.js | 2 +-
src/ui/public/directives/__tests__/validate_index_name.js | 2 +-
src/ui/public/directives/__tests__/validate_ip.js | 2 +-
src/ui/public/directives/__tests__/validate_json.js | 2 +-
src/ui/public/doc_table/__tests__/doc_table.js | 2 +-
src/ui/public/doc_table/__tests__/lib/get_sort.js | 2 +-
src/ui/public/doc_table/__tests__/lib/rows_headers.js | 2 +-
src/ui/public/doc_title/__tests__/doc_title.js | 2 +-
src/ui/public/doc_viewer/__tests__/doc_viewer.js | 2 +-
src/ui/public/factories/__tests__/base_object.js | 2 +-
src/ui/public/factories/__tests__/events.js | 2 +-
src/ui/public/fancy_forms/__tests__/fancy_forms.js | 2 +-
src/ui/public/field_editor/__tests__/field_editor.js | 2 +-
src/ui/public/filter_bar/__tests__/_add_filters.js | 2 +-
src/ui/public/filter_bar/__tests__/_get_filters.js | 2 +-
src/ui/public/filter_bar/__tests__/_invert_filters.js | 2 +-
src/ui/public/filter_bar/__tests__/_pin_filters.js | 2 +-
src/ui/public/filter_bar/__tests__/_remove_filters.js | 2 +-
src/ui/public/filter_bar/__tests__/_toggle_filters.js | 2 +-
src/ui/public/filter_bar/__tests__/_update_filters.js | 2 +-
src/ui/public/filter_bar/__tests__/filter_bar.js | 2 +-
src/ui/public/filter_bar/__tests__/push_filter.js | 2 +-
src/ui/public/filter_bar/__tests__/query_filter.js | 2 +-
src/ui/public/filter_bar/lib/__tests__/change_time_filter.js | 2 +-
src/ui/public/filter_bar/lib/__tests__/extract_time_filter.js | 2 +-
.../filter_bar/lib/__tests__/filter_out_time_based_filter.js | 2 +-
.../public/filter_bar/lib/__tests__/generate_mapping_chain.js | 2 +-
.../public/filter_bar/lib/__tests__/map_and_flatten_filters.js | 2 +-
src/ui/public/filter_bar/lib/__tests__/map_default.js | 2 +-
src/ui/public/filter_bar/lib/__tests__/map_exists.js | 2 +-
src/ui/public/filter_bar/lib/__tests__/map_filter.js | 2 +-
.../filter_bar/lib/__tests__/map_flatten_and_wrap_filters.js | 2 +-
src/ui/public/filter_bar/lib/__tests__/map_geo_bounding_box.js | 2 +-
src/ui/public/filter_bar/lib/__tests__/map_match_all.js | 2 +-
src/ui/public/filter_bar/lib/__tests__/map_missing.js | 2 +-
src/ui/public/filter_bar/lib/__tests__/map_query_string.js | 2 +-
src/ui/public/filter_bar/lib/__tests__/map_range.js | 2 +-
src/ui/public/filter_bar/lib/__tests__/map_script.js | 2 +-
src/ui/public/filter_bar/lib/__tests__/map_terms.js | 2 +-
src/ui/public/filter_manager/__tests__/filter_manager.js | 2 +-
src/ui/public/filter_manager/lib/__tests__/phrase.js | 2 +-
src/ui/public/filter_manager/lib/__tests__/query.js | 2 +-
src/ui/public/filter_manager/lib/__tests__/range.js | 2 +-
src/ui/public/filters/__tests__/comma_list.js | 2 +-
src/ui/public/filters/__tests__/field_type.js | 2 +-
src/ui/public/filters/__tests__/label.js | 2 +-
src/ui/public/filters/__tests__/moment.js | 2 +-
src/ui/public/filters/__tests__/rison.js | 2 +-
src/ui/public/filters/__tests__/short_dots.js | 2 +-
src/ui/public/filters/__tests__/start_from.js | 2 +-
src/ui/public/filters/__tests__/uriescape.js | 2 +-
src/ui/public/highlight/__tests__/highlight.js | 2 +-
src/ui/public/index_patterns/__tests__/_cast_mapping_type.js | 2 +-
src/ui/public/index_patterns/__tests__/_field_format.js | 2 +-
src/ui/public/index_patterns/__tests__/_get_computed_fields.js | 2 +-
src/ui/public/index_patterns/__tests__/_index_pattern.js | 2 +-
src/ui/public/index_patterns/__tests__/_map_field.js | 2 +-
src/ui/public/index_patterns/__tests__/calculate_indices.js | 2 +-
src/ui/public/index_patterns/__tests__/flatten_hit.js | 2 +-
src/ui/public/index_patterns/__tests__/index_patterns.js | 2 +-
src/ui/public/index_patterns/__tests__/intervals.js | 2 +-
src/ui/public/listen/__tests__/listen.js | 2 +-
src/ui/public/navbar/__tests__/navbar.js | 2 +-
src/ui/public/notify/__tests__/notifier.js | 2 +-
src/ui/public/paginated_table/__tests__/index.js | 2 +-
src/ui/public/persisted_log/__tests__/persisted_log.js | 2 +-
src/ui/public/persisted_state/__tests__/persisted_state.js | 2 +-
src/ui/public/private/__tests__/private.js | 2 +-
src/ui/public/promises/__tests__/promises.js | 2 +-
src/ui/public/reflow_watcher/__tests__/reflow_watcher.js | 2 +-
src/ui/public/registry/__tests__/index.js | 2 +-
src/ui/public/render_directive/__tests__/render_directive.js | 2 +-
src/ui/public/routes/__tests__/_route_manager.js | 2 +-
src/ui/public/routes/__tests__/_work_queue.js | 2 +-
src/ui/public/routes/__tests__/_wrap_route_with_prep.js | 2 +-
src/ui/public/safe_confirm/__tests__/safe_confirm.js | 2 +-
src/ui/public/state_management/__tests__/app_state.js | 2 +-
src/ui/public/state_management/__tests__/global_state.js | 2 +-
src/ui/public/state_management/__tests__/state.js | 2 +-
src/ui/public/storage/__tests__/storage.js | 2 +-
src/ui/public/stringify/__tests__/_color.js | 2 +-
src/ui/public/stringify/__tests__/_conformance.js | 2 +-
src/ui/public/stringify/__tests__/_date.js | 2 +-
src/ui/public/stringify/__tests__/_ip.js | 2 +-
src/ui/public/stringify/__tests__/_source.js | 2 +-
src/ui/public/stringify/__tests__/_string.js | 2 +-
src/ui/public/stringify/__tests__/_truncate.js | 2 +-
src/ui/public/stringify/__tests__/_url.js | 2 +-
src/ui/public/style_compile/__tests__/style_compile.js | 2 +-
src/ui/public/test_harness/test_harness.js | 2 +-
src/ui/public/timefilter/__tests__/diff_interval.js | 2 +-
src/ui/public/timefilter/__tests__/diff_time.js | 2 +-
src/ui/public/url/__tests__/url.js | 2 +-
src/ui/public/utils/__tests__/diff_time_picker_vals.js | 2 +-
src/ui/public/utils/__tests__/mapping_setup.js | 2 +-
src/ui/public/utils/__tests__/scanner.js | 2 +-
src/ui/public/vis/__tests__/_agg_config.js | 2 +-
src/ui/public/vis/__tests__/_agg_config_result.js | 2 +-
src/ui/public/vis/__tests__/_agg_configs.js | 2 +-
src/ui/public/vis/__tests__/_renderbot.js | 2 +-
src/ui/public/vis/__tests__/_vis.js | 2 +-
src/ui/public/vislib/__tests__/components/color.js | 2 +-
src/ui/public/vislib/__tests__/components/labels.js | 2 +-
src/ui/public/vislib/__tests__/components/zero_injection.js | 2 +-
src/ui/public/vislib/__tests__/index.js | 2 +-
src/ui/public/vislib/__tests__/lib/axis_title.js | 2 +-
src/ui/public/vislib/__tests__/lib/chart_title.js | 2 +-
src/ui/public/vislib/__tests__/lib/data.js | 2 +-
src/ui/public/vislib/__tests__/lib/dispatch.js | 2 +-
src/ui/public/vislib/__tests__/lib/error_handler.js | 2 +-
src/ui/public/vislib/__tests__/lib/handler/handler.js | 2 +-
src/ui/public/vislib/__tests__/lib/layout/layout.js | 2 +-
src/ui/public/vislib/__tests__/lib/layout/layout_types.js | 2 +-
.../vislib/__tests__/lib/layout/splits/column_chart/splits.js | 2 +-
.../public/vislib/__tests__/lib/layout/types/column_layout.js | 2 +-
src/ui/public/vislib/__tests__/lib/resize_checker.js | 2 +-
src/ui/public/vislib/__tests__/lib/x_axis.js | 2 +-
src/ui/public/vislib/__tests__/lib/y_axis.js | 2 +-
src/ui/public/vislib/__tests__/vis.js | 2 +-
src/ui/public/vislib/__tests__/visualizations/area_chart.js | 2 +-
src/ui/public/vislib/__tests__/visualizations/chart.js | 2 +-
src/ui/public/vislib/__tests__/visualizations/column_chart.js | 2 +-
src/ui/public/vislib/__tests__/visualizations/line_chart.js | 2 +-
src/ui/public/vislib/__tests__/visualizations/pie_chart.js | 2 +-
src/ui/public/vislib/__tests__/visualizations/tile_maps/map.js | 2 +-
.../public/vislib/__tests__/visualizations/tile_maps/markers.js | 2 +-
.../vislib/__tests__/visualizations/tile_maps/tile_map.js | 2 +-
src/ui/public/vislib/__tests__/visualizations/time_marker.js | 2 +-
src/ui/public/vislib/__tests__/visualizations/vis_types.js | 2 +-
src/ui/public/vislib_vis_type/__tests__/_build_chart_data.js | 2 +-
src/ui/public/vislib_vis_type/__tests__/_vislib_renderbot.js | 2 +-
src/ui/public/watch_multi/__tests__/watch_multi.js | 2 +-
223 files changed, 223 insertions(+), 223 deletions(-)
diff --git a/src/plugins/kbn_doc_views/public/__tests__/doc_views.js b/src/plugins/kbn_doc_views/public/__tests__/doc_views.js
index 4d6a1f7052447..76643b9baa6d1 100644
--- a/src/plugins/kbn_doc_views/public/__tests__/doc_views.js
+++ b/src/plugins/kbn_doc_views/public/__tests__/doc_views.js
@@ -2,7 +2,7 @@ import angular from 'angular';
import _ from 'lodash';
import sinon from 'auto-release-sinon';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import $ from 'jquery';
import 'ui/render_directive';
import 'plugins/kbn_doc_views/views/table';
diff --git a/src/plugins/kibana/public/discover/__tests__/directives/discover_field.js b/src/plugins/kibana/public/discover/__tests__/directives/discover_field.js
index 554c97fdb27d6..7515cf94fc842 100644
--- a/src/plugins/kibana/public/discover/__tests__/directives/discover_field.js
+++ b/src/plugins/kibana/public/discover/__tests__/directives/discover_field.js
@@ -2,7 +2,7 @@
import angular from 'angular';
import _ from 'lodash';
import sinon from 'auto-release-sinon';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import expect from 'expect.js';
import $ from 'jquery';
import 'ui/private';
diff --git a/src/plugins/kibana/public/discover/__tests__/directives/field_calculator.js b/src/plugins/kibana/public/discover/__tests__/directives/field_calculator.js
index f4820abfbc9c5..e248be72b4f2c 100644
--- a/src/plugins/kibana/public/discover/__tests__/directives/field_calculator.js
+++ b/src/plugins/kibana/public/discover/__tests__/directives/field_calculator.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import fieldCalculator from 'plugins/kibana/discover/components/field_chooser/lib/field_calculator';
import expect from 'expect.js';
import 'ui/private';
diff --git a/src/plugins/kibana/public/discover/__tests__/directives/field_chooser.js b/src/plugins/kibana/public/discover/__tests__/directives/field_chooser.js
index 78c7fca669c0f..d892dcbb99d3f 100644
--- a/src/plugins/kibana/public/discover/__tests__/directives/field_chooser.js
+++ b/src/plugins/kibana/public/discover/__tests__/directives/field_chooser.js
@@ -1,6 +1,6 @@
import angular from 'angular';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import _ from 'lodash';
import sinon from 'auto-release-sinon';
import expect from 'expect.js';
diff --git a/src/plugins/kibana/public/discover/__tests__/hit_sort_fn.js b/src/plugins/kibana/public/discover/__tests__/hit_sort_fn.js
index 601b192827901..197f499d0720c 100644
--- a/src/plugins/kibana/public/discover/__tests__/hit_sort_fn.js
+++ b/src/plugins/kibana/public/discover/__tests__/hit_sort_fn.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import expect from 'expect.js';
import PluginsKibanaDiscoverHitSortFnProvider from 'plugins/kibana/discover/_hit_sort_fn';
diff --git a/src/plugins/kibana/public/doc/__tests__/doc.js b/src/plugins/kibana/public/doc/__tests__/doc.js
index 32bec47cadbbc..5efbe5a49f980 100644
--- a/src/plugins/kibana/public/doc/__tests__/doc.js
+++ b/src/plugins/kibana/public/doc/__tests__/doc.js
@@ -1,5 +1,5 @@
// Load the kibana app dependencies.
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import expect from 'expect.js';
import 'plugins/kibana/doc/index';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
diff --git a/src/plugins/kibana/public/visualize/editor/__tests__/agg.js b/src/plugins/kibana/public/visualize/editor/__tests__/agg.js
index 0afced983fb88..df8d592098b7f 100644
--- a/src/plugins/kibana/public/visualize/editor/__tests__/agg.js
+++ b/src/plugins/kibana/public/visualize/editor/__tests__/agg.js
@@ -2,7 +2,7 @@
import angular from 'angular';
import _ from 'lodash';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import $ from 'jquery';
import 'plugins/kibana/visualize/editor/agg';
diff --git a/src/plugins/markdown_vis/public/__tests__/markdown_vis_controller.js b/src/plugins/markdown_vis/public/__tests__/markdown_vis_controller.js
index 0c6f45fef4553..93fafef12882c 100644
--- a/src/plugins/markdown_vis/public/__tests__/markdown_vis_controller.js
+++ b/src/plugins/markdown_vis/public/__tests__/markdown_vis_controller.js
@@ -1,4 +1,4 @@
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import expect from 'expect.js';
describe('markdown vis controller', function () {
diff --git a/src/plugins/metric_vis/public/__tests__/metric_vis_controller.js b/src/plugins/metric_vis/public/__tests__/metric_vis_controller.js
index 032d83fedf2a7..a745d90c7f841 100644
--- a/src/plugins/metric_vis/public/__tests__/metric_vis_controller.js
+++ b/src/plugins/metric_vis/public/__tests__/metric_vis_controller.js
@@ -1,4 +1,4 @@
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import expect from 'expect.js';
describe('metric vis', function () {
diff --git a/src/plugins/table_vis/public/__tests__/_table_vis.js b/src/plugins/table_vis/public/__tests__/_table_vis.js
index 8d54948f1b672..8578d7ce1529b 100644
--- a/src/plugins/table_vis/public/__tests__/_table_vis.js
+++ b/src/plugins/table_vis/public/__tests__/_table_vis.js
@@ -1,7 +1,7 @@
import $ from 'jquery';
import _ from 'lodash';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import sinon from 'auto-release-sinon';
import AggResponseTabifyTableGroupProvider from 'ui/agg_response/tabify/_table_group';
import VisProvider from 'ui/vis';
diff --git a/src/plugins/table_vis/public/__tests__/_table_vis_controller.js b/src/plugins/table_vis/public/__tests__/_table_vis_controller.js
index ebc00d8fa8558..8b923b0337f0e 100644
--- a/src/plugins/table_vis/public/__tests__/_table_vis_controller.js
+++ b/src/plugins/table_vis/public/__tests__/_table_vis_controller.js
@@ -1,7 +1,7 @@
import $ from 'jquery';
import _ from 'lodash';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import sinon from 'auto-release-sinon';
import tabifyPm from 'ui/agg_response/tabify/tabify';
import AggResponseTabifyTableGroupProvider from 'ui/agg_response/tabify/_table_group';
diff --git a/src/plugins/tests_bundle/index.js b/src/plugins/tests_bundle/index.js
index b0ce3446f3b46..817d8963a5f49 100644
--- a/src/plugins/tests_bundle/index.js
+++ b/src/plugins/tests_bundle/index.js
@@ -66,7 +66,7 @@ export default (kibana) => {
},
modules: {
- ngMock$: fromRoot('src/plugins/dev_mode/public/ngMock'),
+ ng_mock$: fromRoot('src/plugins/dev_mode/public/ng_mock'),
fixtures: fromRoot('src/fixtures'),
test_utils: fromRoot('src/test_utils'),
'angular-mocks': {
diff --git a/src/ui/public/agg_response/geo_json/__tests__/geo_json.js b/src/ui/public/agg_response/geo_json/__tests__/geo_json.js
index 55466e4a583ac..dffaa87e2b66c 100644
--- a/src/ui/public/agg_response/geo_json/__tests__/geo_json.js
+++ b/src/ui/public/agg_response/geo_json/__tests__/geo_json.js
@@ -1,7 +1,7 @@
import _ from 'lodash';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import VisProvider from 'ui/vis';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
import FixturesAggRespGeohashGridProvider from 'fixtures/agg_resp/geohash_grid';
diff --git a/src/ui/public/agg_response/hierarchical/__tests__/build_hierarchical_data.js b/src/ui/public/agg_response/hierarchical/__tests__/build_hierarchical_data.js
index 3cecb26b18c06..68e258ba1d06b 100644
--- a/src/ui/public/agg_response/hierarchical/__tests__/build_hierarchical_data.js
+++ b/src/ui/public/agg_response/hierarchical/__tests__/build_hierarchical_data.js
@@ -3,7 +3,7 @@ import _ from 'lodash';
import fixtures from 'fixtures/fake_hierarchical_data';
import sinon from 'auto-release-sinon';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import VisProvider from 'ui/vis';
import VisAggConfigsProvider from 'ui/vis/agg_configs';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
diff --git a/src/ui/public/agg_response/hierarchical/__tests__/create_raw_data.js b/src/ui/public/agg_response/hierarchical/__tests__/create_raw_data.js
index a34a311ad2023..2f89a7697bc93 100644
--- a/src/ui/public/agg_response/hierarchical/__tests__/create_raw_data.js
+++ b/src/ui/public/agg_response/hierarchical/__tests__/create_raw_data.js
@@ -4,7 +4,7 @@ import fixtures from 'fixtures/fake_hierarchical_data';
import createRawData from 'ui/agg_response/hierarchical/_create_raw_data';
import arrayToLinkedList from 'ui/agg_response/hierarchical/_array_to_linked_list';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import VisProvider from 'ui/vis';
import VisAggConfigsProvider from 'ui/vis/agg_configs';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
diff --git a/src/ui/public/agg_response/hierarchical/__tests__/transform_aggregation.js b/src/ui/public/agg_response/hierarchical/__tests__/transform_aggregation.js
index 3e524f7c7517b..b40f7a7de9053 100644
--- a/src/ui/public/agg_response/hierarchical/__tests__/transform_aggregation.js
+++ b/src/ui/public/agg_response/hierarchical/__tests__/transform_aggregation.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import AggResponseHierarchicalTransformAggregationProvider from 'ui/agg_response/hierarchical/_transform_aggregation';
describe('buildHierarchicalData()', function () {
diff --git a/src/ui/public/agg_response/point_series/__tests__/_add_to_siri.js b/src/ui/public/agg_response/point_series/__tests__/_add_to_siri.js
index 4fdb81c605ae7..483765e37e74a 100644
--- a/src/ui/public/agg_response/point_series/__tests__/_add_to_siri.js
+++ b/src/ui/public/agg_response/point_series/__tests__/_add_to_siri.js
@@ -1,5 +1,5 @@
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import AggResponsePointSeriesAddToSiriProvider from 'ui/agg_response/point_series/_add_to_siri';
describe('addToSiri', function () {
var addToSiri;
diff --git a/src/ui/public/agg_response/point_series/__tests__/_fake_x_aspect.js b/src/ui/public/agg_response/point_series/__tests__/_fake_x_aspect.js
index 9fe50931b2020..5447589c8178b 100644
--- a/src/ui/public/agg_response/point_series/__tests__/_fake_x_aspect.js
+++ b/src/ui/public/agg_response/point_series/__tests__/_fake_x_aspect.js
@@ -1,5 +1,5 @@
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import VisProvider from 'ui/vis';
import VisAggConfigProvider from 'ui/vis/agg_config';
import AggTypesAggTypeProvider from 'ui/agg_types/agg_type';
diff --git a/src/ui/public/agg_response/point_series/__tests__/_get_aspects.js b/src/ui/public/agg_response/point_series/__tests__/_get_aspects.js
index ef154c3220054..551484c84a79c 100644
--- a/src/ui/public/agg_response/point_series/__tests__/_get_aspects.js
+++ b/src/ui/public/agg_response/point_series/__tests__/_get_aspects.js
@@ -1,7 +1,7 @@
import _ from 'lodash';
import moment from 'moment';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import VisProvider from 'ui/vis';
import AggResponsePointSeriesAddToSiriProvider from 'ui/agg_response/point_series/_add_to_siri';
import VisAggConfigProvider from 'ui/vis/agg_config';
diff --git a/src/ui/public/agg_response/point_series/__tests__/_get_point.js b/src/ui/public/agg_response/point_series/__tests__/_get_point.js
index 90c69d46d9b03..173d68a8983ef 100644
--- a/src/ui/public/agg_response/point_series/__tests__/_get_point.js
+++ b/src/ui/public/agg_response/point_series/__tests__/_get_point.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import AggResponsePointSeriesGetPointProvider from 'ui/agg_response/point_series/_get_point';
describe('getPoint', function () {
diff --git a/src/ui/public/agg_response/point_series/__tests__/_get_series.js b/src/ui/public/agg_response/point_series/__tests__/_get_series.js
index 07939ac0f3b34..ce2d4506e6a15 100644
--- a/src/ui/public/agg_response/point_series/__tests__/_get_series.js
+++ b/src/ui/public/agg_response/point_series/__tests__/_get_series.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import AggResponsePointSeriesGetSeriesProvider from 'ui/agg_response/point_series/_get_series';
describe('getSeries', function () {
var getSeries;
diff --git a/src/ui/public/agg_response/point_series/__tests__/_init_x_axis.js b/src/ui/public/agg_response/point_series/__tests__/_init_x_axis.js
index dc1b9ab27684d..4a00b2b5beb6e 100644
--- a/src/ui/public/agg_response/point_series/__tests__/_init_x_axis.js
+++ b/src/ui/public/agg_response/point_series/__tests__/_init_x_axis.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import AggResponsePointSeriesInitXAxisProvider from 'ui/agg_response/point_series/_init_x_axis';
describe('initXAxis', function () {
diff --git a/src/ui/public/agg_response/point_series/__tests__/_init_y_axis.js b/src/ui/public/agg_response/point_series/__tests__/_init_y_axis.js
index c15a4aa314742..5c42090963b3f 100644
--- a/src/ui/public/agg_response/point_series/__tests__/_init_y_axis.js
+++ b/src/ui/public/agg_response/point_series/__tests__/_init_y_axis.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import AggResponsePointSeriesInitYAxisProvider from 'ui/agg_response/point_series/_init_y_axis';
describe('initYAxis', function () {
diff --git a/src/ui/public/agg_response/point_series/__tests__/_main.js b/src/ui/public/agg_response/point_series/__tests__/_main.js
index 76e7ee001f302..9563f397e27d7 100644
--- a/src/ui/public/agg_response/point_series/__tests__/_main.js
+++ b/src/ui/public/agg_response/point_series/__tests__/_main.js
@@ -2,7 +2,7 @@ import _ from 'lodash';
import moment from 'moment';
import AggConfigResult from 'ui/vis/agg_config_result';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import VisProvider from 'ui/vis';
import AggResponseTabifyTableProvider from 'ui/agg_response/tabify/_table';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
diff --git a/src/ui/public/agg_response/point_series/__tests__/_ordered_date_axis.js b/src/ui/public/agg_response/point_series/__tests__/_ordered_date_axis.js
index 040ee2ddce21e..8becee118e43b 100644
--- a/src/ui/public/agg_response/point_series/__tests__/_ordered_date_axis.js
+++ b/src/ui/public/agg_response/point_series/__tests__/_ordered_date_axis.js
@@ -2,7 +2,7 @@ import moment from 'moment';
import _ from 'lodash';
import sinon from 'auto-release-sinon';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import AggResponsePointSeriesOrderedDateAxisProvider from 'ui/agg_response/point_series/_ordered_date_axis';
describe('orderedDateAxis', function () {
diff --git a/src/ui/public/agg_response/point_series/__tests__/_tooltip_formatter.js b/src/ui/public/agg_response/point_series/__tests__/_tooltip_formatter.js
index 3bd12d0298c9b..16ccb6eb78b0a 100644
--- a/src/ui/public/agg_response/point_series/__tests__/_tooltip_formatter.js
+++ b/src/ui/public/agg_response/point_series/__tests__/_tooltip_formatter.js
@@ -1,7 +1,7 @@
import _ from 'lodash';
import $ from 'jquery';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import AggResponsePointSeriesTooltipFormatterProvider from 'ui/agg_response/point_series/_tooltip_formatter';
describe('tooltipFormatter', function () {
diff --git a/src/ui/public/agg_response/tabify/__tests__/_buckets.js b/src/ui/public/agg_response/tabify/__tests__/_buckets.js
index c6ce328e166a1..6b2747ebf93bc 100644
--- a/src/ui/public/agg_response/tabify/__tests__/_buckets.js
+++ b/src/ui/public/agg_response/tabify/__tests__/_buckets.js
@@ -1,5 +1,5 @@
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import AggResponseTabifyBucketsProvider from 'ui/agg_response/tabify/_buckets';
describe('Buckets wrapper', function () {
var Buckets;
diff --git a/src/ui/public/agg_response/tabify/__tests__/_get_columns.js b/src/ui/public/agg_response/tabify/__tests__/_get_columns.js
index 92add315f7b9f..a542c35b1470c 100644
--- a/src/ui/public/agg_response/tabify/__tests__/_get_columns.js
+++ b/src/ui/public/agg_response/tabify/__tests__/_get_columns.js
@@ -1,5 +1,5 @@
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import AggResponseTabifyGetColumnsProvider from 'ui/agg_response/tabify/_get_columns';
import VisProvider from 'ui/vis';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
diff --git a/src/ui/public/agg_response/tabify/__tests__/_integration.js b/src/ui/public/agg_response/tabify/__tests__/_integration.js
index 05f9a99557e8d..b8c4816c06e5d 100644
--- a/src/ui/public/agg_response/tabify/__tests__/_integration.js
+++ b/src/ui/public/agg_response/tabify/__tests__/_integration.js
@@ -1,7 +1,7 @@
import _ from 'lodash';
import fixtures from 'fixtures/fake_hierarchical_data';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import AggResponseTabifyTabifyProvider from 'ui/agg_response/tabify/tabify';
import VisProvider from 'ui/vis';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
diff --git a/src/ui/public/agg_response/tabify/__tests__/_response_writer.js b/src/ui/public/agg_response/tabify/__tests__/_response_writer.js
index 30c9ba1bd7f23..e613da98ee551 100644
--- a/src/ui/public/agg_response/tabify/__tests__/_response_writer.js
+++ b/src/ui/public/agg_response/tabify/__tests__/_response_writer.js
@@ -1,7 +1,7 @@
import _ from 'lodash';
import sinon from 'auto-release-sinon';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import AggResponseTabifyResponseWriterProvider from 'ui/agg_response/tabify/_response_writer';
import AggResponseTabifyTableGroupProvider from 'ui/agg_response/tabify/_table_group';
import AggResponseTabifyBucketsProvider from 'ui/agg_response/tabify/_buckets';
diff --git a/src/ui/public/agg_response/tabify/__tests__/_table.js b/src/ui/public/agg_response/tabify/__tests__/_table.js
index ea734c967c327..c3f9aa9f734f2 100644
--- a/src/ui/public/agg_response/tabify/__tests__/_table.js
+++ b/src/ui/public/agg_response/tabify/__tests__/_table.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import AggResponseTabifyTableProvider from 'ui/agg_response/tabify/_table';
describe('Table class', function () {
diff --git a/src/ui/public/agg_response/tabify/__tests__/_table_group.js b/src/ui/public/agg_response/tabify/__tests__/_table_group.js
index f37756dd75ae5..5c4cd7f515867 100644
--- a/src/ui/public/agg_response/tabify/__tests__/_table_group.js
+++ b/src/ui/public/agg_response/tabify/__tests__/_table_group.js
@@ -1,5 +1,5 @@
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import AggResponseTabifyTableGroupProvider from 'ui/agg_response/tabify/_table_group';
describe('Table Group class', function () {
var TableGroup;
diff --git a/src/ui/public/agg_table/__tests__/_group.js b/src/ui/public/agg_table/__tests__/_group.js
index f3caf0223e83f..1c36a062c7852 100644
--- a/src/ui/public/agg_table/__tests__/_group.js
+++ b/src/ui/public/agg_table/__tests__/_group.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
import $ from 'jquery';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import expect from 'expect.js';
import fixtures from 'fixtures/fake_hierarchical_data';
import AggResponseTabifyTabifyProvider from 'ui/agg_response/tabify/tabify';
diff --git a/src/ui/public/agg_table/__tests__/_table.js b/src/ui/public/agg_table/__tests__/_table.js
index e0f2ad2d56987..b3519a8cb642b 100644
--- a/src/ui/public/agg_table/__tests__/_table.js
+++ b/src/ui/public/agg_table/__tests__/_table.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
import $ from 'jquery';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import expect from 'expect.js';
import fixtures from 'fixtures/fake_hierarchical_data';
import sinon from 'auto-release-sinon';
diff --git a/src/ui/public/agg_types/__tests__/agg_params.js b/src/ui/public/agg_types/__tests__/agg_params.js
index 358bfbb02af83..0fca03b0dda34 100644
--- a/src/ui/public/agg_types/__tests__/agg_params.js
+++ b/src/ui/public/agg_types/__tests__/agg_params.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import expect from 'expect.js';
import AggTypesAggParamsProvider from 'ui/agg_types/agg_params';
import AggTypesParamTypesBaseProvider from 'ui/agg_types/param_types/base';
diff --git a/src/ui/public/agg_types/__tests__/agg_type.js b/src/ui/public/agg_types/__tests__/agg_type.js
index 136886d9f51db..ab8b774cc57d3 100644
--- a/src/ui/public/agg_types/__tests__/agg_type.js
+++ b/src/ui/public/agg_types/__tests__/agg_type.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import sinon from 'auto-release-sinon';
import 'ui/private';
import AggParamsPM from 'ui/agg_types/agg_params';
diff --git a/src/ui/public/agg_types/__tests__/bucket_count_between.js b/src/ui/public/agg_types/__tests__/bucket_count_between.js
index 083698dce3a70..34b62e6a98f7e 100644
--- a/src/ui/public/agg_types/__tests__/bucket_count_between.js
+++ b/src/ui/public/agg_types/__tests__/bucket_count_between.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
import VisProvider from 'ui/vis';
import RegistryVisTypesProvider from 'ui/registry/vis_types';
diff --git a/src/ui/public/agg_types/__tests__/buckets/_histogram.js b/src/ui/public/agg_types/__tests__/buckets/_histogram.js
index 57a4c02a59550..254837aba1098 100644
--- a/src/ui/public/agg_types/__tests__/buckets/_histogram.js
+++ b/src/ui/public/agg_types/__tests__/buckets/_histogram.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import AggTypesIndexProvider from 'ui/agg_types/index';
import AggParamWriterProvider from '../agg_param_writer';
describe('Histogram Agg', function () {
diff --git a/src/ui/public/agg_types/__tests__/buckets/_range.js b/src/ui/public/agg_types/__tests__/buckets/_range.js
index 57578fc3ec851..5c85afeb0d907 100644
--- a/src/ui/public/agg_types/__tests__/buckets/_range.js
+++ b/src/ui/public/agg_types/__tests__/buckets/_range.js
@@ -1,6 +1,6 @@
import { values } from 'lodash';
import _ from 'lodash';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import expect from 'expect.js';
import resp from 'fixtures/agg_resp/range';
import AggTypesIndexProvider from 'ui/agg_types/index';
diff --git a/src/ui/public/agg_types/__tests__/buckets/create_filter/date_histogram.js b/src/ui/public/agg_types/__tests__/buckets/create_filter/date_histogram.js
index 8e9d08ccc5b99..3392cb413dbb5 100644
--- a/src/ui/public/agg_types/__tests__/buckets/create_filter/date_histogram.js
+++ b/src/ui/public/agg_types/__tests__/buckets/create_filter/date_histogram.js
@@ -2,7 +2,7 @@ import _ from 'lodash';
import moment from 'moment';
import sinon from 'auto-release-sinon';
import aggResp from 'fixtures/agg_resp/date_histogram';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import expect from 'expect.js';
import VisProvider from 'ui/vis';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
diff --git a/src/ui/public/agg_types/__tests__/buckets/create_filter/date_range.js b/src/ui/public/agg_types/__tests__/buckets/create_filter/date_range.js
index 960da20d60d58..5fe8ef92b2b60 100644
--- a/src/ui/public/agg_types/__tests__/buckets/create_filter/date_range.js
+++ b/src/ui/public/agg_types/__tests__/buckets/create_filter/date_range.js
@@ -1,7 +1,7 @@
import moment from 'moment';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import VisProvider from 'ui/vis';
import VisAggConfigProvider from 'ui/vis/agg_config';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
diff --git a/src/ui/public/agg_types/__tests__/buckets/create_filter/filters.js b/src/ui/public/agg_types/__tests__/buckets/create_filter/filters.js
index c8b96ffb6fea0..6f63705a97d33 100644
--- a/src/ui/public/agg_types/__tests__/buckets/create_filter/filters.js
+++ b/src/ui/public/agg_types/__tests__/buckets/create_filter/filters.js
@@ -1,7 +1,7 @@
import _ from 'lodash';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import VisProvider from 'ui/vis';
import VisAggConfigProvider from 'ui/vis/agg_config';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
diff --git a/src/ui/public/agg_types/__tests__/buckets/create_filter/histogram.js b/src/ui/public/agg_types/__tests__/buckets/create_filter/histogram.js
index 2891d8d1e21d5..e807bd8a7e196 100644
--- a/src/ui/public/agg_types/__tests__/buckets/create_filter/histogram.js
+++ b/src/ui/public/agg_types/__tests__/buckets/create_filter/histogram.js
@@ -1,7 +1,7 @@
import _ from 'lodash';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import VisProvider from 'ui/vis';
import VisAggConfigProvider from 'ui/vis/agg_config';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
diff --git a/src/ui/public/agg_types/__tests__/buckets/create_filter/ip_range.js b/src/ui/public/agg_types/__tests__/buckets/create_filter/ip_range.js
index 591c72e0060f1..6984e0725b7e7 100644
--- a/src/ui/public/agg_types/__tests__/buckets/create_filter/ip_range.js
+++ b/src/ui/public/agg_types/__tests__/buckets/create_filter/ip_range.js
@@ -1,5 +1,5 @@
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import VisProvider from 'ui/vis';
import VisAggConfigProvider from 'ui/vis/agg_config';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
diff --git a/src/ui/public/agg_types/__tests__/buckets/create_filter/range.js b/src/ui/public/agg_types/__tests__/buckets/create_filter/range.js
index fd90b3d2356a4..841996b137560 100644
--- a/src/ui/public/agg_types/__tests__/buckets/create_filter/range.js
+++ b/src/ui/public/agg_types/__tests__/buckets/create_filter/range.js
@@ -1,5 +1,5 @@
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import VisProvider from 'ui/vis';
import VisAggConfigProvider from 'ui/vis/agg_config';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
diff --git a/src/ui/public/agg_types/__tests__/buckets/create_filter/terms.js b/src/ui/public/agg_types/__tests__/buckets/create_filter/terms.js
index 42c92c50cfa25..f5a27342d5465 100644
--- a/src/ui/public/agg_types/__tests__/buckets/create_filter/terms.js
+++ b/src/ui/public/agg_types/__tests__/buckets/create_filter/terms.js
@@ -1,5 +1,5 @@
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import VisProvider from 'ui/vis';
import VisAggConfigProvider from 'ui/vis/agg_config';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
diff --git a/src/ui/public/agg_types/__tests__/buckets/date_histogram/_editor.js b/src/ui/public/agg_types/__tests__/buckets/date_histogram/_editor.js
index ae78969872d0c..5261b02e9ebd3 100644
--- a/src/ui/public/agg_types/__tests__/buckets/date_histogram/_editor.js
+++ b/src/ui/public/agg_types/__tests__/buckets/date_histogram/_editor.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
import $ from 'jquery';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import expect from 'expect.js';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
import VisProvider from 'ui/vis';
diff --git a/src/ui/public/agg_types/__tests__/buckets/date_histogram/_params.js b/src/ui/public/agg_types/__tests__/buckets/date_histogram/_params.js
index 4e3e73d7d5b1f..ae870c5f3c064 100644
--- a/src/ui/public/agg_types/__tests__/buckets/date_histogram/_params.js
+++ b/src/ui/public/agg_types/__tests__/buckets/date_histogram/_params.js
@@ -1,7 +1,7 @@
import _ from 'lodash';
import moment from 'moment';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import AggParamWriterProvider from '../../agg_param_writer';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
import AggTypesIndexProvider from 'ui/agg_types/index';
diff --git a/src/ui/public/agg_types/__tests__/controls/number_list.js b/src/ui/public/agg_types/__tests__/controls/number_list.js
index 9cee01c17f6e2..c73649b67937b 100644
--- a/src/ui/public/agg_types/__tests__/controls/number_list.js
+++ b/src/ui/public/agg_types/__tests__/controls/number_list.js
@@ -2,7 +2,7 @@ import $ from 'jquery';
import _ from 'lodash';
import expect from 'expect.js';
import simulateKeys from 'test_utils/simulate_keys';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import 'ui/number_list';
describe('NumberList directive', function () {
diff --git a/src/ui/public/agg_types/__tests__/index.js b/src/ui/public/agg_types/__tests__/index.js
index b62ab7f106ecb..8ceb3c95e9f9f 100644
--- a/src/ui/public/agg_types/__tests__/index.js
+++ b/src/ui/public/agg_types/__tests__/index.js
@@ -1,5 +1,5 @@
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import './agg_type';
import './agg_params';
import './bucket_count_between';
diff --git a/src/ui/public/agg_types/__tests__/param_types/_calculate_interval.js b/src/ui/public/agg_types/__tests__/param_types/_calculate_interval.js
index bbac693066a37..b0eb534a961fb 100644
--- a/src/ui/public/agg_types/__tests__/param_types/_calculate_interval.js
+++ b/src/ui/public/agg_types/__tests__/param_types/_calculate_interval.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import VisProvider from 'ui/vis';
import VisAggConfigProvider from 'ui/vis/agg_config';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
diff --git a/src/ui/public/agg_types/__tests__/param_types/_field.js b/src/ui/public/agg_types/__tests__/param_types/_field.js
index 2ffff30514583..019d336d8d9bf 100644
--- a/src/ui/public/agg_types/__tests__/param_types/_field.js
+++ b/src/ui/public/agg_types/__tests__/param_types/_field.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import AggTypesParamTypesBaseProvider from 'ui/agg_types/param_types/base';
import AggTypesParamTypesFieldProvider from 'ui/agg_types/param_types/field';
describe('Field', function () {
diff --git a/src/ui/public/agg_types/__tests__/param_types/_optioned.js b/src/ui/public/agg_types/__tests__/param_types/_optioned.js
index 8404b16f75945..d4d6c7e711a24 100644
--- a/src/ui/public/agg_types/__tests__/param_types/_optioned.js
+++ b/src/ui/public/agg_types/__tests__/param_types/_optioned.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import AggTypesParamTypesBaseProvider from 'ui/agg_types/param_types/base';
import AggTypesParamTypesOptionedProvider from 'ui/agg_types/param_types/optioned';
describe('Optioned', function () {
diff --git a/src/ui/public/agg_types/__tests__/param_types/_raw_json.js b/src/ui/public/agg_types/__tests__/param_types/_raw_json.js
index af69dfefd2bcc..fbfb6a61d9493 100644
--- a/src/ui/public/agg_types/__tests__/param_types/_raw_json.js
+++ b/src/ui/public/agg_types/__tests__/param_types/_raw_json.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import AggTypesParamTypesBaseProvider from 'ui/agg_types/param_types/base';
import AggTypesParamTypesRawJsonProvider from 'ui/agg_types/param_types/raw_json';
diff --git a/src/ui/public/agg_types/__tests__/param_types/_regex.js b/src/ui/public/agg_types/__tests__/param_types/_regex.js
index 1dcd9e7aa8094..5aea856e74845 100644
--- a/src/ui/public/agg_types/__tests__/param_types/_regex.js
+++ b/src/ui/public/agg_types/__tests__/param_types/_regex.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import AggTypesParamTypesBaseProvider from 'ui/agg_types/param_types/base';
import AggTypesParamTypesRegexProvider from 'ui/agg_types/param_types/regex';
import VisProvider from 'ui/vis';
diff --git a/src/ui/public/agg_types/__tests__/param_types/_string.js b/src/ui/public/agg_types/__tests__/param_types/_string.js
index 26f71d9fbc7dc..f6d8629ca72e1 100644
--- a/src/ui/public/agg_types/__tests__/param_types/_string.js
+++ b/src/ui/public/agg_types/__tests__/param_types/_string.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import AggTypesParamTypesBaseProvider from 'ui/agg_types/param_types/base';
import AggTypesParamTypesStringProvider from 'ui/agg_types/param_types/string';
diff --git a/src/ui/public/bind/__tests__/bind.js b/src/ui/public/bind/__tests__/bind.js
index 76aaa29082f19..3b02918a30cdf 100644
--- a/src/ui/public/bind/__tests__/bind.js
+++ b/src/ui/public/bind/__tests__/bind.js
@@ -1,6 +1,6 @@
import sinon from 'auto-release-sinon';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
describe('$scope.$bind', function () {
var $rootScope;
diff --git a/src/ui/public/binder/__tests__/binder.js b/src/ui/public/binder/__tests__/binder.js
index 1d283d8980f84..6bd2a3406de96 100644
--- a/src/ui/public/binder/__tests__/binder.js
+++ b/src/ui/public/binder/__tests__/binder.js
@@ -1,6 +1,6 @@
import sinon from 'auto-release-sinon';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import Binder from 'ui/binder';
import $ from 'jquery';
diff --git a/src/ui/public/chrome/__tests__/nav_controls.js b/src/ui/public/chrome/__tests__/nav_controls.js
index b4d61a813b969..64b3d54ef9d88 100644
--- a/src/ui/public/chrome/__tests__/nav_controls.js
+++ b/src/ui/public/chrome/__tests__/nav_controls.js
@@ -1,4 +1,4 @@
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import $ from 'jquery';
import expect from 'expect.js';
diff --git a/src/ui/public/chrome/api/__tests__/xsrf.js b/src/ui/public/chrome/api/__tests__/xsrf.js
index 09c4790772a8e..8bd5d3b9cd3b0 100644
--- a/src/ui/public/chrome/api/__tests__/xsrf.js
+++ b/src/ui/public/chrome/api/__tests__/xsrf.js
@@ -1,7 +1,7 @@
import $ from 'jquery';
import expect from 'expect.js';
import { stub } from 'auto-release-sinon';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import xsrfChromeApi from '../xsrf';
import { version } from '../../../../../../package.json';
diff --git a/src/ui/public/chrome/directives/app_switcher/__tests__/app_switcher.js b/src/ui/public/chrome/directives/app_switcher/__tests__/app_switcher.js
index 1d56ff08462ad..d09f9aaf909db 100644
--- a/src/ui/public/chrome/directives/app_switcher/__tests__/app_switcher.js
+++ b/src/ui/public/chrome/directives/app_switcher/__tests__/app_switcher.js
@@ -1,5 +1,5 @@
import sinon from 'auto-release-sinon';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import expect from 'expect.js';
import DomLocationProvider from 'ui/dom_location';
diff --git a/src/ui/public/config/__tests__/config.js b/src/ui/public/config/__tests__/config.js
index 03f26c4b6707f..29c88060788d3 100644
--- a/src/ui/public/config/__tests__/config.js
+++ b/src/ui/public/config/__tests__/config.js
@@ -1,5 +1,5 @@
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import ConfigDefaultsProvider from 'ui/config/defaults';
describe('config component', function () {
var $scope;
diff --git a/src/ui/public/courier/__tests__/request_queue.js b/src/ui/public/courier/__tests__/request_queue.js
index 723f0f016ccd4..947671686e1bd 100644
--- a/src/ui/public/courier/__tests__/request_queue.js
+++ b/src/ui/public/courier/__tests__/request_queue.js
@@ -1,4 +1,4 @@
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import expect from 'expect.js';
import sinon from 'auto-release-sinon';
diff --git a/src/ui/public/courier/data_source/__tests__/decorate_query.js b/src/ui/public/courier/data_source/__tests__/decorate_query.js
index 68faabfe947eb..19af6b496643d 100644
--- a/src/ui/public/courier/data_source/__tests__/decorate_query.js
+++ b/src/ui/public/courier/data_source/__tests__/decorate_query.js
@@ -1,6 +1,6 @@
import moment from 'moment';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import _ from 'lodash';
import CourierDataSourceDecorateQueryProvider from 'ui/courier/data_source/_decorate_query';
diff --git a/src/ui/public/courier/data_source/__tests__/doc_source.js b/src/ui/public/courier/data_source/__tests__/doc_source.js
index a9d16fee43533..7be2fbc7496eb 100644
--- a/src/ui/public/courier/data_source/__tests__/doc_source.js
+++ b/src/ui/public/courier/data_source/__tests__/doc_source.js
@@ -1,4 +1,4 @@
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import expect from 'expect.js';
import sinon from 'auto-release-sinon';
diff --git a/src/ui/public/courier/data_source/__tests__/normalize_sort_request.js b/src/ui/public/courier/data_source/__tests__/normalize_sort_request.js
index 1c255c8383db5..8f5ca5c494a82 100644
--- a/src/ui/public/courier/data_source/__tests__/normalize_sort_request.js
+++ b/src/ui/public/courier/data_source/__tests__/normalize_sort_request.js
@@ -1,5 +1,5 @@
import 'ui/private';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import expect from 'expect.js';
import CourierDataSourceNormalizeSortRequestProvider from 'ui/courier/data_source/_normalize_sort_request';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
diff --git a/src/ui/public/courier/data_source/__tests__/search_source.js b/src/ui/public/courier/data_source/__tests__/search_source.js
index 677fde8d85fb7..7559ef9e88eba 100644
--- a/src/ui/public/courier/data_source/__tests__/search_source.js
+++ b/src/ui/public/courier/data_source/__tests__/search_source.js
@@ -1,4 +1,4 @@
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import expect from 'expect.js';
import sinon from 'auto-release-sinon';
diff --git a/src/ui/public/courier/fetch/__tests__/doc.js b/src/ui/public/courier/fetch/__tests__/doc.js
index 25c7e78677912..1ff26bac12694 100644
--- a/src/ui/public/courier/fetch/__tests__/doc.js
+++ b/src/ui/public/courier/fetch/__tests__/doc.js
@@ -1,6 +1,6 @@
import sinon from 'auto-release-sinon';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import CourierDataSourceDocSourceProvider from 'ui/courier/data_source/doc_source';
import CourierFetchRequestDocProvider from 'ui/courier/fetch/request/doc';
diff --git a/src/ui/public/courier/fetch/__tests__/fetch.js b/src/ui/public/courier/fetch/__tests__/fetch.js
index 3666744582f21..8b895f624544d 100644
--- a/src/ui/public/courier/fetch/__tests__/fetch.js
+++ b/src/ui/public/courier/fetch/__tests__/fetch.js
@@ -1,4 +1,4 @@
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import expect from 'expect.js';
import sinon from 'auto-release-sinon';
diff --git a/src/ui/public/courier/fetch/__tests__/fetch_these.js b/src/ui/public/courier/fetch/__tests__/fetch_these.js
index 57d085394bb02..51b204101e9ec 100644
--- a/src/ui/public/courier/fetch/__tests__/fetch_these.js
+++ b/src/ui/public/courier/fetch/__tests__/fetch_these.js
@@ -1,7 +1,7 @@
import _ from 'lodash';
import sinon from 'auto-release-sinon';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import CourierFetchFetchTheseProvider from 'ui/courier/fetch/_fetch_these';
describe('ui/courier/fetch/_fetch_these', () => {
diff --git a/src/ui/public/courier/fetch/request/__tests__/segmented.js b/src/ui/public/courier/fetch/request/__tests__/segmented.js
index 9f2a45d5ad8be..7465aa812c281 100644
--- a/src/ui/public/courier/fetch/request/__tests__/segmented.js
+++ b/src/ui/public/courier/fetch/request/__tests__/segmented.js
@@ -1,6 +1,6 @@
import sinon from 'auto-release-sinon';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import CourierFetchRequestSegmentedProvider from 'ui/courier/fetch/request/segmented';
import CourierFetchRequestSearchProvider from 'ui/courier/fetch/request/search';
describe('ui/courier/fetch/request/segmented', () => {
diff --git a/src/ui/public/courier/fetch/request/__tests__/segmented_create_queue.js b/src/ui/public/courier/fetch/request/__tests__/segmented_create_queue.js
index 9bed019d19007..c5c9f0213c045 100644
--- a/src/ui/public/courier/fetch/request/__tests__/segmented_create_queue.js
+++ b/src/ui/public/courier/fetch/request/__tests__/segmented_create_queue.js
@@ -1,6 +1,6 @@
import sinon from 'auto-release-sinon';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import StubbedSearchSourceProvider from 'fixtures/stubbed_search_source';
import CourierFetchRequestSegmentedProvider from 'ui/courier/fetch/request/segmented';
describe('ui/courier/fetch/request/segmented/_createQueue', () => {
diff --git a/src/ui/public/courier/fetch/request/__tests__/segmented_index_selection.js b/src/ui/public/courier/fetch/request/__tests__/segmented_index_selection.js
index e782b2f2b5c4a..715e831bad2fb 100644
--- a/src/ui/public/courier/fetch/request/__tests__/segmented_index_selection.js
+++ b/src/ui/public/courier/fetch/request/__tests__/segmented_index_selection.js
@@ -1,4 +1,4 @@
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import expect from 'expect.js';
import { times } from 'lodash';
import sinon from 'auto-release-sinon';
diff --git a/src/ui/public/courier/fetch/request/__tests__/segmented_size_picking.js b/src/ui/public/courier/fetch/request/__tests__/segmented_size_picking.js
index 4047130a19029..10a61bd3e473f 100644
--- a/src/ui/public/courier/fetch/request/__tests__/segmented_size_picking.js
+++ b/src/ui/public/courier/fetch/request/__tests__/segmented_size_picking.js
@@ -1,4 +1,4 @@
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import expect from 'expect.js';
import { times } from 'lodash';
import sinon from 'auto-release-sinon';
diff --git a/src/ui/public/courier/fetch/strategy/__tests__/search.js b/src/ui/public/courier/fetch/strategy/__tests__/search.js
index e714007912482..04eec668b8e09 100644
--- a/src/ui/public/courier/fetch/strategy/__tests__/search.js
+++ b/src/ui/public/courier/fetch/strategy/__tests__/search.js
@@ -1,7 +1,7 @@
import _ from 'lodash';
import sinon from 'auto-release-sinon';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import CourierFetchStrategySearchProvider from 'ui/courier/fetch/strategy/search';
describe('ui/courier/fetch/strategy/search', () => {
diff --git a/src/ui/public/debounce/__tests__/debounce.js b/src/ui/public/debounce/__tests__/debounce.js
index df3187e42174f..137de3df71446 100644
--- a/src/ui/public/debounce/__tests__/debounce.js
+++ b/src/ui/public/debounce/__tests__/debounce.js
@@ -1,7 +1,7 @@
import sinon from 'auto-release-sinon';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
var debounce;
var $timeout;
diff --git a/src/ui/public/directives/__tests__/auto_select_if_only_one.js b/src/ui/public/directives/__tests__/auto_select_if_only_one.js
index 4036de599ef82..a6ad20f40c996 100644
--- a/src/ui/public/directives/__tests__/auto_select_if_only_one.js
+++ b/src/ui/public/directives/__tests__/auto_select_if_only_one.js
@@ -1,7 +1,7 @@
import angular from 'angular';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import 'ui/directives/auto_select_if_only_one';
describe('Auto-select if only one directive', function () {
diff --git a/src/ui/public/directives/__tests__/config.js b/src/ui/public/directives/__tests__/config.js
index b05025b773576..25396bec64025 100644
--- a/src/ui/public/directives/__tests__/config.js
+++ b/src/ui/public/directives/__tests__/config.js
@@ -1,4 +1,4 @@
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import expect from 'expect.js';
import { assign } from 'lodash';
import $ from 'jquery';
diff --git a/src/ui/public/directives/__tests__/confirm-click.js b/src/ui/public/directives/__tests__/confirm-click.js
index cb7a13973ed99..3a6c695f601a3 100644
--- a/src/ui/public/directives/__tests__/confirm-click.js
+++ b/src/ui/public/directives/__tests__/confirm-click.js
@@ -1,7 +1,7 @@
import angular from 'angular';
import sinon from 'sinon';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import $ from 'jquery';
import 'ui/directives/confirm_click';
import 'plugins/kibana/discover/index';
diff --git a/src/ui/public/directives/__tests__/css_truncate.js b/src/ui/public/directives/__tests__/css_truncate.js
index 620dfaff13e09..eceee77000101 100644
--- a/src/ui/public/directives/__tests__/css_truncate.js
+++ b/src/ui/public/directives/__tests__/css_truncate.js
@@ -1,6 +1,6 @@
import angular from 'angular';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import $ from 'jquery';
import 'plugins/kibana/discover/index';
diff --git a/src/ui/public/directives/__tests__/fixed_scroll.js b/src/ui/public/directives/__tests__/fixed_scroll.js
index 09d484d2e5a81..3d345e549f613 100644
--- a/src/ui/public/directives/__tests__/fixed_scroll.js
+++ b/src/ui/public/directives/__tests__/fixed_scroll.js
@@ -1,6 +1,6 @@
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import 'ui/fixed_scroll';
import $ from 'jquery';
import sinon from 'auto-release-sinon';
diff --git a/src/ui/public/directives/__tests__/inequality.js b/src/ui/public/directives/__tests__/inequality.js
index 3ca4d6f6d3b7a..d7b7c5578ba12 100644
--- a/src/ui/public/directives/__tests__/inequality.js
+++ b/src/ui/public/directives/__tests__/inequality.js
@@ -1,6 +1,6 @@
import angular from 'angular';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import 'ui/directives/inequality';
describe('greater_than model validator directive', function () {
diff --git a/src/ui/public/directives/__tests__/input_focus.js b/src/ui/public/directives/__tests__/input_focus.js
index 6230c59ccb953..3104be8e46d38 100644
--- a/src/ui/public/directives/__tests__/input_focus.js
+++ b/src/ui/public/directives/__tests__/input_focus.js
@@ -1,6 +1,6 @@
import angular from 'angular';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import $ from 'jquery';
import 'ui/directives/input_focus';
diff --git a/src/ui/public/directives/__tests__/input_whole_number.js b/src/ui/public/directives/__tests__/input_whole_number.js
index f610344317263..6aaa4cb52bdbd 100644
--- a/src/ui/public/directives/__tests__/input_whole_number.js
+++ b/src/ui/public/directives/__tests__/input_whole_number.js
@@ -1,6 +1,6 @@
import angular from 'angular';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import 'ui/directives/input_whole_number';
describe('Whole number input directive', function () {
diff --git a/src/ui/public/directives/__tests__/json_input.js b/src/ui/public/directives/__tests__/json_input.js
index 739e510e20527..8f89ce2b55b2c 100644
--- a/src/ui/public/directives/__tests__/json_input.js
+++ b/src/ui/public/directives/__tests__/json_input.js
@@ -1,6 +1,6 @@
import angular from 'angular';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import 'ui/directives/json_input';
diff --git a/src/ui/public/directives/__tests__/parse_query.js b/src/ui/public/directives/__tests__/parse_query.js
index d1f07d33eea20..8f726e83b4056 100644
--- a/src/ui/public/directives/__tests__/parse_query.js
+++ b/src/ui/public/directives/__tests__/parse_query.js
@@ -1,7 +1,7 @@
import angular from 'angular';
import sinon from 'auto-release-sinon';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
// Load the kibana app dependencies.
diff --git a/src/ui/public/directives/__tests__/spinner.js b/src/ui/public/directives/__tests__/spinner.js
index a585297395b80..291faa3ef2d1a 100644
--- a/src/ui/public/directives/__tests__/spinner.js
+++ b/src/ui/public/directives/__tests__/spinner.js
@@ -1,6 +1,6 @@
import angular from 'angular';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import $ from 'jquery';
import 'plugins/kibana/discover/index';
diff --git a/src/ui/public/directives/__tests__/timepicker.js b/src/ui/public/directives/__tests__/timepicker.js
index d4fb70d7e0f1e..bd8f9f6fe7be6 100644
--- a/src/ui/public/directives/__tests__/timepicker.js
+++ b/src/ui/public/directives/__tests__/timepicker.js
@@ -3,7 +3,7 @@ import moment from 'moment';
import expect from 'expect.js';
import _ from 'lodash';
import sinon from 'auto-release-sinon';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import $ from 'jquery';
import 'plugins/kibana/visualize/index';
import 'plugins/kibana/dashboard/index';
diff --git a/src/ui/public/directives/__tests__/truncate.js b/src/ui/public/directives/__tests__/truncate.js
index ad7eff3f33b93..1c9e1256051b9 100644
--- a/src/ui/public/directives/__tests__/truncate.js
+++ b/src/ui/public/directives/__tests__/truncate.js
@@ -1,6 +1,6 @@
import angular from 'angular';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import $ from 'jquery';
import 'plugins/kibana/discover/index';
diff --git a/src/ui/public/directives/__tests__/typeahead.js b/src/ui/public/directives/__tests__/typeahead.js
index 191a6252f99cb..f6d90ed8ad1f0 100644
--- a/src/ui/public/directives/__tests__/typeahead.js
+++ b/src/ui/public/directives/__tests__/typeahead.js
@@ -1,7 +1,7 @@
import angular from 'angular';
import sinon from 'sinon';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import 'ui/typeahead';
import 'plugins/kibana/discover/index';
diff --git a/src/ui/public/directives/__tests__/validate_cidr_mask.js b/src/ui/public/directives/__tests__/validate_cidr_mask.js
index c9235a3b3fa47..95681f8fe608b 100644
--- a/src/ui/public/directives/__tests__/validate_cidr_mask.js
+++ b/src/ui/public/directives/__tests__/validate_cidr_mask.js
@@ -1,6 +1,6 @@
import angular from 'angular';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import 'ui/directives/validate_cidr_mask';
diff --git a/src/ui/public/directives/__tests__/validate_date_math.js b/src/ui/public/directives/__tests__/validate_date_math.js
index 9654d459acbbf..117977b9b2427 100644
--- a/src/ui/public/directives/__tests__/validate_date_math.js
+++ b/src/ui/public/directives/__tests__/validate_date_math.js
@@ -1,6 +1,6 @@
import angular from 'angular';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import 'ui/directives/validate_date_math';
diff --git a/src/ui/public/directives/__tests__/validate_index_name.js b/src/ui/public/directives/__tests__/validate_index_name.js
index d35617dc1208a..759004a7764f3 100644
--- a/src/ui/public/directives/__tests__/validate_index_name.js
+++ b/src/ui/public/directives/__tests__/validate_index_name.js
@@ -1,6 +1,6 @@
import angular from 'angular';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import 'ui/directives/validate_index_name';
// Load the kibana app dependencies.
diff --git a/src/ui/public/directives/__tests__/validate_ip.js b/src/ui/public/directives/__tests__/validate_ip.js
index dba902108bf75..81a03be15d0c9 100644
--- a/src/ui/public/directives/__tests__/validate_ip.js
+++ b/src/ui/public/directives/__tests__/validate_ip.js
@@ -1,6 +1,6 @@
import angular from 'angular';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import 'ui/directives/validate_ip';
diff --git a/src/ui/public/directives/__tests__/validate_json.js b/src/ui/public/directives/__tests__/validate_json.js
index 4063b2fbc52f2..b182e5906f6f0 100644
--- a/src/ui/public/directives/__tests__/validate_json.js
+++ b/src/ui/public/directives/__tests__/validate_json.js
@@ -1,6 +1,6 @@
import angular from 'angular';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import 'ui/directives/validate_json';
// Load the kibana app dependencies.
diff --git a/src/ui/public/doc_table/__tests__/doc_table.js b/src/ui/public/doc_table/__tests__/doc_table.js
index 5963ad7dc689f..9df39fe9d7df1 100644
--- a/src/ui/public/doc_table/__tests__/doc_table.js
+++ b/src/ui/public/doc_table/__tests__/doc_table.js
@@ -3,7 +3,7 @@ import expect from 'expect.js';
import _ from 'lodash';
import sinon from 'auto-release-sinon';
import searchResponse from 'fixtures/search_response';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import $ from 'jquery';
import 'ui/private';
import 'ui/doc_table';
diff --git a/src/ui/public/doc_table/__tests__/lib/get_sort.js b/src/ui/public/doc_table/__tests__/lib/get_sort.js
index 7c3f95e177f6b..a1ad3811b7962 100644
--- a/src/ui/public/doc_table/__tests__/lib/get_sort.js
+++ b/src/ui/public/doc_table/__tests__/lib/get_sort.js
@@ -1,7 +1,7 @@
import getSort from 'ui/doc_table/lib/get_sort';
var defaultSort = {time: 'desc'};
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
var indexPattern;
diff --git a/src/ui/public/doc_table/__tests__/lib/rows_headers.js b/src/ui/public/doc_table/__tests__/lib/rows_headers.js
index c2f80a4357424..b33ee202291c4 100644
--- a/src/ui/public/doc_table/__tests__/lib/rows_headers.js
+++ b/src/ui/public/doc_table/__tests__/lib/rows_headers.js
@@ -2,7 +2,7 @@ import angular from 'angular';
import _ from 'lodash';
import sinon from 'auto-release-sinon';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import getFakeRow from 'fixtures/fake_row';
import $ from 'jquery';
import 'plugins/kibana/discover/index';
diff --git a/src/ui/public/doc_title/__tests__/doc_title.js b/src/ui/public/doc_title/__tests__/doc_title.js
index a064ab78b64a9..5313063e2b224 100644
--- a/src/ui/public/doc_title/__tests__/doc_title.js
+++ b/src/ui/public/doc_title/__tests__/doc_title.js
@@ -1,7 +1,7 @@
import _ from 'lodash';
import sinon from 'auto-release-sinon';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import DocTitleProvider from 'ui/doc_title';
describe('docTitle Service', function () {
diff --git a/src/ui/public/doc_viewer/__tests__/doc_viewer.js b/src/ui/public/doc_viewer/__tests__/doc_viewer.js
index b50ae7729c5b3..fcd64aab90b1c 100644
--- a/src/ui/public/doc_viewer/__tests__/doc_viewer.js
+++ b/src/ui/public/doc_viewer/__tests__/doc_viewer.js
@@ -1,7 +1,7 @@
import angular from 'angular';
import _ from 'lodash';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import 'ui/private';
import docViewsRegistry from 'ui/registry/doc_views';
diff --git a/src/ui/public/factories/__tests__/base_object.js b/src/ui/public/factories/__tests__/base_object.js
index d33f0cc220d96..c19ffc10a67fb 100644
--- a/src/ui/public/factories/__tests__/base_object.js
+++ b/src/ui/public/factories/__tests__/base_object.js
@@ -2,7 +2,7 @@ import angular from 'angular';
import _ from 'lodash';
import sinon from 'sinon';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import 'ui/private';
describe('Base Object', function () {
diff --git a/src/ui/public/factories/__tests__/events.js b/src/ui/public/factories/__tests__/events.js
index cfe0fbfa1778c..2d37485791e01 100644
--- a/src/ui/public/factories/__tests__/events.js
+++ b/src/ui/public/factories/__tests__/events.js
@@ -3,7 +3,7 @@ import angular from 'angular';
import _ from 'lodash';
import sinon from 'auto-release-sinon';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import 'ui/private';
import EventsProvider from 'ui/events';
diff --git a/src/ui/public/fancy_forms/__tests__/fancy_forms.js b/src/ui/public/fancy_forms/__tests__/fancy_forms.js
index c1dd31b2728c0..c24240521684e 100644
--- a/src/ui/public/fancy_forms/__tests__/fancy_forms.js
+++ b/src/ui/public/fancy_forms/__tests__/fancy_forms.js
@@ -1,4 +1,4 @@
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import expect from 'expect.js';
import $ from 'jquery';
diff --git a/src/ui/public/field_editor/__tests__/field_editor.js b/src/ui/public/field_editor/__tests__/field_editor.js
index 89b54cd4c0609..d5aae3c231e0f 100644
--- a/src/ui/public/field_editor/__tests__/field_editor.js
+++ b/src/ui/public/field_editor/__tests__/field_editor.js
@@ -1,5 +1,5 @@
import $ from 'jquery';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import expect from 'expect.js';
import IndexPatternsFieldProvider from 'ui/index_patterns/_field';
import RegistryFieldFormatsProvider from 'ui/registry/field_formats';
diff --git a/src/ui/public/filter_bar/__tests__/_add_filters.js b/src/ui/public/filter_bar/__tests__/_add_filters.js
index 656adabc502bf..13c3ab0353c22 100644
--- a/src/ui/public/filter_bar/__tests__/_add_filters.js
+++ b/src/ui/public/filter_bar/__tests__/_add_filters.js
@@ -1,7 +1,7 @@
import _ from 'lodash';
import sinon from 'auto-release-sinon';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import MockState from 'fixtures/mock_state';
import FilterBarQueryFilterProvider from 'ui/filter_bar/query_filter';
describe('add filters', function () {
diff --git a/src/ui/public/filter_bar/__tests__/_get_filters.js b/src/ui/public/filter_bar/__tests__/_get_filters.js
index 38dd7f8cd0476..94c68e19f8835 100644
--- a/src/ui/public/filter_bar/__tests__/_get_filters.js
+++ b/src/ui/public/filter_bar/__tests__/_get_filters.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import expect from 'expect.js';
import MockState from 'fixtures/mock_state';
import FilterBarQueryFilterProvider from 'ui/filter_bar/query_filter';
diff --git a/src/ui/public/filter_bar/__tests__/_invert_filters.js b/src/ui/public/filter_bar/__tests__/_invert_filters.js
index f1b44054d4764..b99189b5e5c64 100644
--- a/src/ui/public/filter_bar/__tests__/_invert_filters.js
+++ b/src/ui/public/filter_bar/__tests__/_invert_filters.js
@@ -1,7 +1,7 @@
import _ from 'lodash';
import sinon from 'auto-release-sinon';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import MockState from 'fixtures/mock_state';
import FilterBarQueryFilterProvider from 'ui/filter_bar/query_filter';
describe('invert filters', function () {
diff --git a/src/ui/public/filter_bar/__tests__/_pin_filters.js b/src/ui/public/filter_bar/__tests__/_pin_filters.js
index 273ecb626ec7a..d8f962869f1d1 100644
--- a/src/ui/public/filter_bar/__tests__/_pin_filters.js
+++ b/src/ui/public/filter_bar/__tests__/_pin_filters.js
@@ -1,7 +1,7 @@
import _ from 'lodash';
import sinon from 'auto-release-sinon';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import MockState from 'fixtures/mock_state';
import FilterBarQueryFilterProvider from 'ui/filter_bar/query_filter';
describe('pin filters', function () {
diff --git a/src/ui/public/filter_bar/__tests__/_remove_filters.js b/src/ui/public/filter_bar/__tests__/_remove_filters.js
index 9a04c2a30d07e..7b311c84fd27f 100644
--- a/src/ui/public/filter_bar/__tests__/_remove_filters.js
+++ b/src/ui/public/filter_bar/__tests__/_remove_filters.js
@@ -1,7 +1,7 @@
import _ from 'lodash';
import sinon from 'auto-release-sinon';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import MockState from 'fixtures/mock_state';
import FilterBarQueryFilterProvider from 'ui/filter_bar/query_filter';
describe('remove filters', function () {
diff --git a/src/ui/public/filter_bar/__tests__/_toggle_filters.js b/src/ui/public/filter_bar/__tests__/_toggle_filters.js
index a05a41e6346e4..b81abe52eea56 100644
--- a/src/ui/public/filter_bar/__tests__/_toggle_filters.js
+++ b/src/ui/public/filter_bar/__tests__/_toggle_filters.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import sinon from 'auto-release-sinon';
import MockState from 'fixtures/mock_state';
import FilterBarQueryFilterProvider from 'ui/filter_bar/query_filter';
diff --git a/src/ui/public/filter_bar/__tests__/_update_filters.js b/src/ui/public/filter_bar/__tests__/_update_filters.js
index 5de414606aa65..99244cc111368 100644
--- a/src/ui/public/filter_bar/__tests__/_update_filters.js
+++ b/src/ui/public/filter_bar/__tests__/_update_filters.js
@@ -1,7 +1,7 @@
import _ from 'lodash';
import sinon from 'auto-release-sinon';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import MockState from 'fixtures/mock_state';
import FilterBarQueryFilterProvider from 'ui/filter_bar/query_filter';
describe('update filters', function () {
diff --git a/src/ui/public/filter_bar/__tests__/filter_bar.js b/src/ui/public/filter_bar/__tests__/filter_bar.js
index 5a80892ae7bde..f1c450bc0459f 100644
--- a/src/ui/public/filter_bar/__tests__/filter_bar.js
+++ b/src/ui/public/filter_bar/__tests__/filter_bar.js
@@ -1,6 +1,6 @@
import angular from 'angular';
import _ from 'lodash';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import expect from 'expect.js';
import sinon from 'sinon';
diff --git a/src/ui/public/filter_bar/__tests__/push_filter.js b/src/ui/public/filter_bar/__tests__/push_filter.js
index f885acd245071..aebc3651b4c0b 100644
--- a/src/ui/public/filter_bar/__tests__/push_filter.js
+++ b/src/ui/public/filter_bar/__tests__/push_filter.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import FilterBarPushFilterProvider from 'ui/filter_bar/push_filter';
describe('Filter Bar pushFilter()', function () {
diff --git a/src/ui/public/filter_bar/__tests__/query_filter.js b/src/ui/public/filter_bar/__tests__/query_filter.js
index 4b973eb81a5c6..f8411ed469f49 100644
--- a/src/ui/public/filter_bar/__tests__/query_filter.js
+++ b/src/ui/public/filter_bar/__tests__/query_filter.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import './_get_filters';
import './_add_filters';
import './_remove_filters';
diff --git a/src/ui/public/filter_bar/lib/__tests__/change_time_filter.js b/src/ui/public/filter_bar/lib/__tests__/change_time_filter.js
index 543250d59b033..bbda04ddebe99 100644
--- a/src/ui/public/filter_bar/lib/__tests__/change_time_filter.js
+++ b/src/ui/public/filter_bar/lib/__tests__/change_time_filter.js
@@ -1,6 +1,6 @@
import moment from 'moment';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import expect from 'expect.js';
import FilterBarLibChangeTimeFilterProvider from 'ui/filter_bar/lib/change_time_filter';
describe('Filter Bar Directive', function () {
diff --git a/src/ui/public/filter_bar/lib/__tests__/extract_time_filter.js b/src/ui/public/filter_bar/lib/__tests__/extract_time_filter.js
index 746999ac5dd09..23bc5e1417413 100644
--- a/src/ui/public/filter_bar/lib/__tests__/extract_time_filter.js
+++ b/src/ui/public/filter_bar/lib/__tests__/extract_time_filter.js
@@ -1,6 +1,6 @@
import sinon from 'auto-release-sinon';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import FilterBarLibExtractTimeFilterProvider from 'ui/filter_bar/lib/extract_time_filter';
describe('Filter Bar Directive', function () {
diff --git a/src/ui/public/filter_bar/lib/__tests__/filter_out_time_based_filter.js b/src/ui/public/filter_bar/lib/__tests__/filter_out_time_based_filter.js
index 4400eda46122a..9d103438d1905 100644
--- a/src/ui/public/filter_bar/lib/__tests__/filter_out_time_based_filter.js
+++ b/src/ui/public/filter_bar/lib/__tests__/filter_out_time_based_filter.js
@@ -1,5 +1,5 @@
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import sinon from 'auto-release-sinon';
import FilterBarLibFilterOutTimeBasedFilterProvider from 'ui/filter_bar/lib/filter_out_time_based_filter';
diff --git a/src/ui/public/filter_bar/lib/__tests__/generate_mapping_chain.js b/src/ui/public/filter_bar/lib/__tests__/generate_mapping_chain.js
index c1ec103a34374..03b5c564f7309 100644
--- a/src/ui/public/filter_bar/lib/__tests__/generate_mapping_chain.js
+++ b/src/ui/public/filter_bar/lib/__tests__/generate_mapping_chain.js
@@ -1,6 +1,6 @@
import sinon from 'auto-release-sinon';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import FilterBarLibGenerateMappingChainProvider from 'ui/filter_bar/lib/generate_mapping_chain';
describe('Filter Bar Directive', function () {
diff --git a/src/ui/public/filter_bar/lib/__tests__/map_and_flatten_filters.js b/src/ui/public/filter_bar/lib/__tests__/map_and_flatten_filters.js
index 13b2a1cac8a41..bfc8116982a66 100644
--- a/src/ui/public/filter_bar/lib/__tests__/map_and_flatten_filters.js
+++ b/src/ui/public/filter_bar/lib/__tests__/map_and_flatten_filters.js
@@ -1,5 +1,5 @@
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import sinon from 'auto-release-sinon';
import FilterBarLibMapAndFlattenFiltersProvider from 'ui/filter_bar/lib/map_and_flatten_filters';
diff --git a/src/ui/public/filter_bar/lib/__tests__/map_default.js b/src/ui/public/filter_bar/lib/__tests__/map_default.js
index e3d51f0e60817..d03ea3e481ff7 100644
--- a/src/ui/public/filter_bar/lib/__tests__/map_default.js
+++ b/src/ui/public/filter_bar/lib/__tests__/map_default.js
@@ -1,5 +1,5 @@
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import FilterBarLibMapDefaultProvider from 'ui/filter_bar/lib/map_default';
describe('Filter Bar Directive', function () {
describe('mapDefault()', function () {
diff --git a/src/ui/public/filter_bar/lib/__tests__/map_exists.js b/src/ui/public/filter_bar/lib/__tests__/map_exists.js
index d5f496076ad91..f3c494223626b 100644
--- a/src/ui/public/filter_bar/lib/__tests__/map_exists.js
+++ b/src/ui/public/filter_bar/lib/__tests__/map_exists.js
@@ -1,5 +1,5 @@
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import FilterBarLibMapExistsProvider from 'ui/filter_bar/lib/map_exists';
describe('Filter Bar Directive', function () {
describe('mapExists()', function () {
diff --git a/src/ui/public/filter_bar/lib/__tests__/map_filter.js b/src/ui/public/filter_bar/lib/__tests__/map_filter.js
index 9c8e46a100671..5931a00b7b28f 100644
--- a/src/ui/public/filter_bar/lib/__tests__/map_filter.js
+++ b/src/ui/public/filter_bar/lib/__tests__/map_filter.js
@@ -1,6 +1,6 @@
import sinon from 'auto-release-sinon';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import FilterBarLibMapFilterProvider from 'ui/filter_bar/lib/map_filter';
describe('Filter Bar Directive', function () {
diff --git a/src/ui/public/filter_bar/lib/__tests__/map_flatten_and_wrap_filters.js b/src/ui/public/filter_bar/lib/__tests__/map_flatten_and_wrap_filters.js
index 9f2ccc80fa835..46b8c6a01c43f 100644
--- a/src/ui/public/filter_bar/lib/__tests__/map_flatten_and_wrap_filters.js
+++ b/src/ui/public/filter_bar/lib/__tests__/map_flatten_and_wrap_filters.js
@@ -2,7 +2,7 @@
import _ from 'lodash';
import sinon from 'auto-release-sinon';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import FilterBarLibMapFlattenAndWrapFiltersProvider from 'ui/filter_bar/lib/map_flatten_and_wrap_filters';
describe('Filter Bar Directive', function () {
describe('mapFlattenAndWrapFilters()', function () {
diff --git a/src/ui/public/filter_bar/lib/__tests__/map_geo_bounding_box.js b/src/ui/public/filter_bar/lib/__tests__/map_geo_bounding_box.js
index d586f4de6a72b..11acded334c23 100644
--- a/src/ui/public/filter_bar/lib/__tests__/map_geo_bounding_box.js
+++ b/src/ui/public/filter_bar/lib/__tests__/map_geo_bounding_box.js
@@ -1,6 +1,6 @@
import sinon from 'auto-release-sinon';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import FilterBarLibMapGeoBoundingBoxProvider from 'ui/filter_bar/lib/map_geo_bounding_box';
describe('Filter Bar Directive', function () {
diff --git a/src/ui/public/filter_bar/lib/__tests__/map_match_all.js b/src/ui/public/filter_bar/lib/__tests__/map_match_all.js
index 93911461918c7..3f8ce53a02f6f 100644
--- a/src/ui/public/filter_bar/lib/__tests__/map_match_all.js
+++ b/src/ui/public/filter_bar/lib/__tests__/map_match_all.js
@@ -1,5 +1,5 @@
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import FilterBarLibMapMatchAllProvider from 'ui/filter_bar/lib/map_match_all';
describe('ui/filter_bar/lib', function () {
diff --git a/src/ui/public/filter_bar/lib/__tests__/map_missing.js b/src/ui/public/filter_bar/lib/__tests__/map_missing.js
index 0025cf289c389..8566b41c07cb5 100644
--- a/src/ui/public/filter_bar/lib/__tests__/map_missing.js
+++ b/src/ui/public/filter_bar/lib/__tests__/map_missing.js
@@ -1,4 +1,4 @@
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import expect from 'expect.js';
import FilterBarLibMapMissingProvider from 'ui/filter_bar/lib/map_missing';
describe('Filter Bar Directive', function () {
diff --git a/src/ui/public/filter_bar/lib/__tests__/map_query_string.js b/src/ui/public/filter_bar/lib/__tests__/map_query_string.js
index b9b734190138e..89f5a5786685c 100644
--- a/src/ui/public/filter_bar/lib/__tests__/map_query_string.js
+++ b/src/ui/public/filter_bar/lib/__tests__/map_query_string.js
@@ -1,5 +1,5 @@
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import FilterBarLibMapQueryStringProvider from 'ui/filter_bar/lib/map_query_string';
describe('Filter Bar Directive', function () {
describe('mapQueryString()', function () {
diff --git a/src/ui/public/filter_bar/lib/__tests__/map_range.js b/src/ui/public/filter_bar/lib/__tests__/map_range.js
index 83476e73c3809..c6338bc4ff59a 100644
--- a/src/ui/public/filter_bar/lib/__tests__/map_range.js
+++ b/src/ui/public/filter_bar/lib/__tests__/map_range.js
@@ -1,6 +1,6 @@
import sinon from 'auto-release-sinon';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import FilterBarLibMapRangeProvider from 'ui/filter_bar/lib/map_range';
describe('Filter Bar Directive', function () {
diff --git a/src/ui/public/filter_bar/lib/__tests__/map_script.js b/src/ui/public/filter_bar/lib/__tests__/map_script.js
index b2eb81b5c6ce0..c2e7c94b96870 100644
--- a/src/ui/public/filter_bar/lib/__tests__/map_script.js
+++ b/src/ui/public/filter_bar/lib/__tests__/map_script.js
@@ -1,6 +1,6 @@
import sinon from 'auto-release-sinon';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import FilterBarLibMapScriptProvider from 'ui/filter_bar/lib/map_script';
describe('Filter Bar Directive', function () {
diff --git a/src/ui/public/filter_bar/lib/__tests__/map_terms.js b/src/ui/public/filter_bar/lib/__tests__/map_terms.js
index 723fac7be4709..71818e8c3a38d 100644
--- a/src/ui/public/filter_bar/lib/__tests__/map_terms.js
+++ b/src/ui/public/filter_bar/lib/__tests__/map_terms.js
@@ -1,6 +1,6 @@
import sinon from 'auto-release-sinon';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import FilterBarLibMapTermsProvider from 'ui/filter_bar/lib/map_terms';
describe('Filter Bar Directive', function () {
diff --git a/src/ui/public/filter_manager/__tests__/filter_manager.js b/src/ui/public/filter_manager/__tests__/filter_manager.js
index 4caa67cf2b6d3..7a11b80de4c32 100644
--- a/src/ui/public/filter_manager/__tests__/filter_manager.js
+++ b/src/ui/public/filter_manager/__tests__/filter_manager.js
@@ -2,7 +2,7 @@ import _ from 'lodash';
import sinon from 'auto-release-sinon';
import MockState from 'fixtures/mock_state';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import FilterManagerProvider from 'ui/filter_manager';
import FilterBarQueryFilterProvider from 'ui/filter_bar/query_filter';
var $rootScope;
diff --git a/src/ui/public/filter_manager/lib/__tests__/phrase.js b/src/ui/public/filter_manager/lib/__tests__/phrase.js
index 891b6f66048f3..983cf5a918855 100644
--- a/src/ui/public/filter_manager/lib/__tests__/phrase.js
+++ b/src/ui/public/filter_manager/lib/__tests__/phrase.js
@@ -2,7 +2,7 @@
import fn from 'ui/filter_manager/lib/phrase';
import expect from 'expect.js';
import _ from 'lodash';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
var indexPattern;
var expected;
diff --git a/src/ui/public/filter_manager/lib/__tests__/query.js b/src/ui/public/filter_manager/lib/__tests__/query.js
index 5cbd0db0b60bb..798fa0937dc57 100644
--- a/src/ui/public/filter_manager/lib/__tests__/query.js
+++ b/src/ui/public/filter_manager/lib/__tests__/query.js
@@ -2,7 +2,7 @@
import fn from 'ui/filter_manager/lib/query';
import expect from 'expect.js';
import _ from 'lodash';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
var indexPattern;
var expected;
diff --git a/src/ui/public/filter_manager/lib/__tests__/range.js b/src/ui/public/filter_manager/lib/__tests__/range.js
index f6981972ca565..f1d97f179bcf5 100644
--- a/src/ui/public/filter_manager/lib/__tests__/range.js
+++ b/src/ui/public/filter_manager/lib/__tests__/range.js
@@ -2,7 +2,7 @@
import fn from 'ui/filter_manager/lib/range';
import expect from 'expect.js';
import _ from 'lodash';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
var indexPattern;
var expected;
diff --git a/src/ui/public/filters/__tests__/comma_list.js b/src/ui/public/filters/__tests__/comma_list.js
index b0a1e505f8087..d54e39c8e9d41 100644
--- a/src/ui/public/filters/__tests__/comma_list.js
+++ b/src/ui/public/filters/__tests__/comma_list.js
@@ -1,5 +1,5 @@
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import 'ui/filters/comma_list';
describe('Comma-List filter', function () {
diff --git a/src/ui/public/filters/__tests__/field_type.js b/src/ui/public/filters/__tests__/field_type.js
index 2c29c9f728508..ff2816855ce9a 100644
--- a/src/ui/public/filters/__tests__/field_type.js
+++ b/src/ui/public/filters/__tests__/field_type.js
@@ -1,7 +1,7 @@
import angular from 'angular';
import expect from 'expect.js';
import _ from 'lodash';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import 'plugins/kibana/discover/index';
import 'ui/filters/field_type';
diff --git a/src/ui/public/filters/__tests__/label.js b/src/ui/public/filters/__tests__/label.js
index 0224f0214e0b8..d4cdd3bf5c40c 100644
--- a/src/ui/public/filters/__tests__/label.js
+++ b/src/ui/public/filters/__tests__/label.js
@@ -2,7 +2,7 @@ import angular from 'angular';
import expect from 'expect.js';
import _ from 'lodash';
import faker from 'faker';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import 'plugins/kibana/discover/index';
// Load kibana and its applications
diff --git a/src/ui/public/filters/__tests__/moment.js b/src/ui/public/filters/__tests__/moment.js
index d7bfc9e3c5d0d..72f1bb98203be 100644
--- a/src/ui/public/filters/__tests__/moment.js
+++ b/src/ui/public/filters/__tests__/moment.js
@@ -2,7 +2,7 @@ import angular from 'angular';
import expect from 'expect.js';
import sinon from 'auto-release-sinon';
import moment from 'moment';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import 'ui/filters/moment';
diff --git a/src/ui/public/filters/__tests__/rison.js b/src/ui/public/filters/__tests__/rison.js
index 5e891834bbe06..768203f257681 100644
--- a/src/ui/public/filters/__tests__/rison.js
+++ b/src/ui/public/filters/__tests__/rison.js
@@ -1,6 +1,6 @@
import angular from 'angular';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import 'plugins/kibana/discover/index';
// Load kibana and its applications
diff --git a/src/ui/public/filters/__tests__/short_dots.js b/src/ui/public/filters/__tests__/short_dots.js
index e5ca6f2233247..c4de34d12ce27 100644
--- a/src/ui/public/filters/__tests__/short_dots.js
+++ b/src/ui/public/filters/__tests__/short_dots.js
@@ -1,7 +1,7 @@
import angular from 'angular';
import expect from 'expect.js';
import _ from 'lodash';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import 'plugins/kibana/discover/index';
import 'ui/filters/short_dots';
diff --git a/src/ui/public/filters/__tests__/start_from.js b/src/ui/public/filters/__tests__/start_from.js
index 1e00f526c7c5a..408b4396a7c25 100644
--- a/src/ui/public/filters/__tests__/start_from.js
+++ b/src/ui/public/filters/__tests__/start_from.js
@@ -1,6 +1,6 @@
import angular from 'angular';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import 'ui/filters/start_from';
diff --git a/src/ui/public/filters/__tests__/uriescape.js b/src/ui/public/filters/__tests__/uriescape.js
index 104c83e12162a..6702c7713dd53 100644
--- a/src/ui/public/filters/__tests__/uriescape.js
+++ b/src/ui/public/filters/__tests__/uriescape.js
@@ -1,7 +1,7 @@
import angular from 'angular';
import expect from 'expect.js';
import _ from 'lodash';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import 'plugins/kibana/discover/index';
diff --git a/src/ui/public/highlight/__tests__/highlight.js b/src/ui/public/highlight/__tests__/highlight.js
index 375ca88aab913..b66f3b1d38ebe 100644
--- a/src/ui/public/highlight/__tests__/highlight.js
+++ b/src/ui/public/highlight/__tests__/highlight.js
@@ -1,6 +1,6 @@
import angular from 'angular';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import 'ui/highlight';
describe('Highlight', function () {
diff --git a/src/ui/public/index_patterns/__tests__/_cast_mapping_type.js b/src/ui/public/index_patterns/__tests__/_cast_mapping_type.js
index 34b94ff448ced..4e55b1d613ad7 100644
--- a/src/ui/public/index_patterns/__tests__/_cast_mapping_type.js
+++ b/src/ui/public/index_patterns/__tests__/_cast_mapping_type.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import expect from 'expect.js';
import IndexPatternsCastMappingTypeProvider from 'ui/index_patterns/_cast_mapping_type';
describe('type normalizer (castMappingType)', function () {
diff --git a/src/ui/public/index_patterns/__tests__/_field_format.js b/src/ui/public/index_patterns/__tests__/_field_format.js
index cd8554e6230b6..f9e156b7ff5ce 100644
--- a/src/ui/public/index_patterns/__tests__/_field_format.js
+++ b/src/ui/public/index_patterns/__tests__/_field_format.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import IndexPatternsFieldFormatFieldFormatProvider from 'ui/index_patterns/_field_format/field_format';
describe('FieldFormat class', function () {
diff --git a/src/ui/public/index_patterns/__tests__/_get_computed_fields.js b/src/ui/public/index_patterns/__tests__/_get_computed_fields.js
index 046f7dc283828..0d5309fe0c998 100644
--- a/src/ui/public/index_patterns/__tests__/_get_computed_fields.js
+++ b/src/ui/public/index_patterns/__tests__/_get_computed_fields.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
describe('get computed fields', function () {
diff --git a/src/ui/public/index_patterns/__tests__/_index_pattern.js b/src/ui/public/index_patterns/__tests__/_index_pattern.js
index e71284a084b63..58458a6b80f2c 100644
--- a/src/ui/public/index_patterns/__tests__/_index_pattern.js
+++ b/src/ui/public/index_patterns/__tests__/_index_pattern.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
import sinon from 'auto-release-sinon';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import expect from 'expect.js';
import Promise from 'bluebird';
import errors from 'ui/errors';
diff --git a/src/ui/public/index_patterns/__tests__/_map_field.js b/src/ui/public/index_patterns/__tests__/_map_field.js
index b795ab53a8506..cbc7b783334c8 100644
--- a/src/ui/public/index_patterns/__tests__/_map_field.js
+++ b/src/ui/public/index_patterns/__tests__/_map_field.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import IndexPatternsMapFieldProvider from 'ui/index_patterns/_map_field';
describe('field mapping normalizer (mapField)', function () {
diff --git a/src/ui/public/index_patterns/__tests__/calculate_indices.js b/src/ui/public/index_patterns/__tests__/calculate_indices.js
index ae190f029fcca..aefd7f458faa8 100644
--- a/src/ui/public/index_patterns/__tests__/calculate_indices.js
+++ b/src/ui/public/index_patterns/__tests__/calculate_indices.js
@@ -2,7 +2,7 @@ import { pluck } from 'lodash';
import _ from 'lodash';
import sinon from 'auto-release-sinon';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import moment from 'moment';
import IndexPatternsCalculateIndicesProvider from 'ui/index_patterns/_calculate_indices';
describe('ui/index_patterns/_calculate_indices', () => {
diff --git a/src/ui/public/index_patterns/__tests__/flatten_hit.js b/src/ui/public/index_patterns/__tests__/flatten_hit.js
index bfeb19148b720..9fda8bd0411d0 100644
--- a/src/ui/public/index_patterns/__tests__/flatten_hit.js
+++ b/src/ui/public/index_patterns/__tests__/flatten_hit.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import IndexPatternsFlattenHitProvider from 'ui/index_patterns/_flatten_hit';
describe('IndexPattern#flattenHit()', function () {
diff --git a/src/ui/public/index_patterns/__tests__/index_patterns.js b/src/ui/public/index_patterns/__tests__/index_patterns.js
index 7146e94f2e27a..6ef012dfc135b 100644
--- a/src/ui/public/index_patterns/__tests__/index_patterns.js
+++ b/src/ui/public/index_patterns/__tests__/index_patterns.js
@@ -1,4 +1,4 @@
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import expect from 'expect.js';
import sinon from 'auto-release-sinon';
import IndexPatternProvider from '../_index_pattern';
diff --git a/src/ui/public/index_patterns/__tests__/intervals.js b/src/ui/public/index_patterns/__tests__/intervals.js
index d46ecbd822371..73e2d376e928d 100644
--- a/src/ui/public/index_patterns/__tests__/intervals.js
+++ b/src/ui/public/index_patterns/__tests__/intervals.js
@@ -1,7 +1,7 @@
import moment from 'moment';
import { pluck } from 'lodash';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import IndexPatternsIntervalsProvider from 'ui/index_patterns/_intervals';
describe('Index Patterns', function () {
diff --git a/src/ui/public/listen/__tests__/listen.js b/src/ui/public/listen/__tests__/listen.js
index 0970a511b4f64..b81480e2276f8 100644
--- a/src/ui/public/listen/__tests__/listen.js
+++ b/src/ui/public/listen/__tests__/listen.js
@@ -1,6 +1,6 @@
import sinon from 'auto-release-sinon';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import 'ui/listen';
import EventsProvider from 'ui/events';
diff --git a/src/ui/public/navbar/__tests__/navbar.js b/src/ui/public/navbar/__tests__/navbar.js
index 507cd017e2439..571445c8733f4 100644
--- a/src/ui/public/navbar/__tests__/navbar.js
+++ b/src/ui/public/navbar/__tests__/navbar.js
@@ -1,4 +1,4 @@
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import sinon from 'sinon';
import expect from 'expect.js';
import angular from 'angular';
diff --git a/src/ui/public/notify/__tests__/notifier.js b/src/ui/public/notify/__tests__/notifier.js
index a7febe7c5b93b..ed2df33aeede7 100644
--- a/src/ui/public/notify/__tests__/notifier.js
+++ b/src/ui/public/notify/__tests__/notifier.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import expect from 'expect.js';
import Notifier from 'ui/notify/notifier';
describe('Notifier', function () {
diff --git a/src/ui/public/paginated_table/__tests__/index.js b/src/ui/public/paginated_table/__tests__/index.js
index f9020a2004400..1507c74b7b87f 100644
--- a/src/ui/public/paginated_table/__tests__/index.js
+++ b/src/ui/public/paginated_table/__tests__/index.js
@@ -2,7 +2,7 @@
import _ from 'lodash';
import sinon from 'sinon';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import 'ui/paginated_table';
import $ from 'jquery';
diff --git a/src/ui/public/persisted_log/__tests__/persisted_log.js b/src/ui/public/persisted_log/__tests__/persisted_log.js
index 1d618e048542d..1c8c1d8303f53 100644
--- a/src/ui/public/persisted_log/__tests__/persisted_log.js
+++ b/src/ui/public/persisted_log/__tests__/persisted_log.js
@@ -1,7 +1,7 @@
import sinon from 'sinon';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import 'ui/persisted_log';
var storage;
diff --git a/src/ui/public/persisted_state/__tests__/persisted_state.js b/src/ui/public/persisted_state/__tests__/persisted_state.js
index b411dc076af0d..dc7d8515dc89e 100644
--- a/src/ui/public/persisted_state/__tests__/persisted_state.js
+++ b/src/ui/public/persisted_state/__tests__/persisted_state.js
@@ -1,7 +1,7 @@
import _ from 'lodash';
import sinon from 'auto-release-sinon';
import noDigestPromises from 'test_utils/no_digest_promises';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import expect from 'expect.js';
import errors from 'ui/errors';
import PersistedStatePersistedStateProvider from 'ui/persisted_state/persisted_state';
diff --git a/src/ui/public/private/__tests__/private.js b/src/ui/public/private/__tests__/private.js
index 2f5244b430407..be8321b7799a4 100644
--- a/src/ui/public/private/__tests__/private.js
+++ b/src/ui/public/private/__tests__/private.js
@@ -1,5 +1,5 @@
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
describe('Private module loader', function () {
diff --git a/src/ui/public/promises/__tests__/promises.js b/src/ui/public/promises/__tests__/promises.js
index b9617ee3e2cf8..9ded576e76cf3 100644
--- a/src/ui/public/promises/__tests__/promises.js
+++ b/src/ui/public/promises/__tests__/promises.js
@@ -1,5 +1,5 @@
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import sinon from 'auto-release-sinon';
describe('Promise service', function () {
diff --git a/src/ui/public/reflow_watcher/__tests__/reflow_watcher.js b/src/ui/public/reflow_watcher/__tests__/reflow_watcher.js
index f06b0e82ab646..5b206662b0a0b 100644
--- a/src/ui/public/reflow_watcher/__tests__/reflow_watcher.js
+++ b/src/ui/public/reflow_watcher/__tests__/reflow_watcher.js
@@ -3,7 +3,7 @@ import $ from 'jquery';
import _ from 'lodash';
import expect from 'expect.js';
import sinon from 'auto-release-sinon';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import EventsProvider from 'ui/events';
import ReflowWatcherProvider from 'ui/reflow_watcher';
describe('Reflow watcher', function () {
diff --git a/src/ui/public/registry/__tests__/index.js b/src/ui/public/registry/__tests__/index.js
index 2f05c03894fc2..7b448660eacd0 100644
--- a/src/ui/public/registry/__tests__/index.js
+++ b/src/ui/public/registry/__tests__/index.js
@@ -2,7 +2,7 @@ import _ from 'lodash';
import sinon from 'auto-release-sinon';
import registry from 'ui/registry/_registry';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
describe('Registry', function () {
var Private;
var IndexedArray;
diff --git a/src/ui/public/render_directive/__tests__/render_directive.js b/src/ui/public/render_directive/__tests__/render_directive.js
index 216ce1ca8982b..d3aee70c38351 100644
--- a/src/ui/public/render_directive/__tests__/render_directive.js
+++ b/src/ui/public/render_directive/__tests__/render_directive.js
@@ -1,7 +1,7 @@
import angular from 'angular';
import sinon from 'sinon';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import 'ui/render_directive';
let init;
diff --git a/src/ui/public/routes/__tests__/_route_manager.js b/src/ui/public/routes/__tests__/_route_manager.js
index f1178bc144f3e..f015e98b6323b 100644
--- a/src/ui/public/routes/__tests__/_route_manager.js
+++ b/src/ui/public/routes/__tests__/_route_manager.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import sinon from 'auto-release-sinon';
import RouteManager from 'ui/routes/route_manager';
import expect from 'expect.js';
diff --git a/src/ui/public/routes/__tests__/_work_queue.js b/src/ui/public/routes/__tests__/_work_queue.js
index 3afdc07df9c62..91ff1fe92181a 100644
--- a/src/ui/public/routes/__tests__/_work_queue.js
+++ b/src/ui/public/routes/__tests__/_work_queue.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import WorkQueue from 'ui/routes/work_queue';
import sinon from 'auto-release-sinon';
import 'ui/promises';
diff --git a/src/ui/public/routes/__tests__/_wrap_route_with_prep.js b/src/ui/public/routes/__tests__/_wrap_route_with_prep.js
index 8118467142c5c..6de90f2a40d44 100644
--- a/src/ui/public/routes/__tests__/_wrap_route_with_prep.js
+++ b/src/ui/public/routes/__tests__/_wrap_route_with_prep.js
@@ -1,6 +1,6 @@
import RouteManager from 'ui/routes/route_manager';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import wrapRouteWithPrep from 'ui/routes/wrap_route_with_prep';
import Promise from 'bluebird';
diff --git a/src/ui/public/safe_confirm/__tests__/safe_confirm.js b/src/ui/public/safe_confirm/__tests__/safe_confirm.js
index 55cdc6bf48a56..be7fbf86f35a4 100644
--- a/src/ui/public/safe_confirm/__tests__/safe_confirm.js
+++ b/src/ui/public/safe_confirm/__tests__/safe_confirm.js
@@ -1,6 +1,6 @@
import sinon from 'sinon';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
describe('ui/safe_confirm', function () {
var $rootScope;
diff --git a/src/ui/public/state_management/__tests__/app_state.js b/src/ui/public/state_management/__tests__/app_state.js
index 7cfb82be08202..2e3fca03912dd 100644
--- a/src/ui/public/state_management/__tests__/app_state.js
+++ b/src/ui/public/state_management/__tests__/app_state.js
@@ -1,6 +1,6 @@
import sinon from 'auto-release-sinon';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import 'ui/state_management/app_state';
import StateManagementAppStateProvider from 'ui/state_management/app_state';
diff --git a/src/ui/public/state_management/__tests__/global_state.js b/src/ui/public/state_management/__tests__/global_state.js
index e64d11f3d12d2..1bb5b6dcb92f3 100644
--- a/src/ui/public/state_management/__tests__/global_state.js
+++ b/src/ui/public/state_management/__tests__/global_state.js
@@ -1,7 +1,7 @@
import sinon from 'sinon';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import 'ui/state_management/global_state';
describe('State Management', function () {
diff --git a/src/ui/public/state_management/__tests__/state.js b/src/ui/public/state_management/__tests__/state.js
index 43b538ee3f308..fa3aed0288ff6 100644
--- a/src/ui/public/state_management/__tests__/state.js
+++ b/src/ui/public/state_management/__tests__/state.js
@@ -2,7 +2,7 @@
import _ from 'lodash';
import sinon from 'sinon';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import 'ui/private';
import StateManagementStateProvider from 'ui/state_management/state';
import EventsProvider from 'ui/events';
diff --git a/src/ui/public/storage/__tests__/storage.js b/src/ui/public/storage/__tests__/storage.js
index f1464fd27af9f..30ff6c0c885cb 100644
--- a/src/ui/public/storage/__tests__/storage.js
+++ b/src/ui/public/storage/__tests__/storage.js
@@ -1,6 +1,6 @@
import sinon from 'sinon';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import 'ui/storage';
var storage;
diff --git a/src/ui/public/stringify/__tests__/_color.js b/src/ui/public/stringify/__tests__/_color.js
index 1a1bcbf45d8aa..d3be85b28665f 100644
--- a/src/ui/public/stringify/__tests__/_color.js
+++ b/src/ui/public/stringify/__tests__/_color.js
@@ -1,5 +1,5 @@
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import RegistryFieldFormatsProvider from 'ui/registry/field_formats';
describe('Color Format', function () {
var fieldFormats;
diff --git a/src/ui/public/stringify/__tests__/_conformance.js b/src/ui/public/stringify/__tests__/_conformance.js
index 37af3a4e73447..878c96b325241 100644
--- a/src/ui/public/stringify/__tests__/_conformance.js
+++ b/src/ui/public/stringify/__tests__/_conformance.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import RegistryFieldFormatsProvider from 'ui/registry/field_formats';
import IndexPatternsFieldFormatFieldFormatProvider from 'ui/index_patterns/_field_format/field_format';
diff --git a/src/ui/public/stringify/__tests__/_date.js b/src/ui/public/stringify/__tests__/_date.js
index 52783f0ee2bfc..ecc848df93e0f 100644
--- a/src/ui/public/stringify/__tests__/_date.js
+++ b/src/ui/public/stringify/__tests__/_date.js
@@ -1,5 +1,5 @@
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import moment from 'moment-timezone';
import RegistryFieldFormatsProvider from 'ui/registry/field_formats';
describe('Date Format', function () {
diff --git a/src/ui/public/stringify/__tests__/_ip.js b/src/ui/public/stringify/__tests__/_ip.js
index 9ac9d11728930..3bac7116c7b97 100644
--- a/src/ui/public/stringify/__tests__/_ip.js
+++ b/src/ui/public/stringify/__tests__/_ip.js
@@ -1,5 +1,5 @@
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import RegistryFieldFormatsProvider from 'ui/registry/field_formats';
describe('IP Address Format', function () {
var fieldFormats;
diff --git a/src/ui/public/stringify/__tests__/_source.js b/src/ui/public/stringify/__tests__/_source.js
index 52ac3cea361ba..11b3a67466e2c 100644
--- a/src/ui/public/stringify/__tests__/_source.js
+++ b/src/ui/public/stringify/__tests__/_source.js
@@ -1,7 +1,7 @@
import $ from 'jquery';
import _ from 'lodash';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import RegistryFieldFormatsProvider from 'ui/registry/field_formats';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
import FixturesHitsProvider from 'fixtures/hits';
diff --git a/src/ui/public/stringify/__tests__/_string.js b/src/ui/public/stringify/__tests__/_string.js
index 9f9f4fd7900ad..46390667ccbd9 100644
--- a/src/ui/public/stringify/__tests__/_string.js
+++ b/src/ui/public/stringify/__tests__/_string.js
@@ -1,5 +1,5 @@
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import RegistryFieldFormatsProvider from 'ui/registry/field_formats';
describe('String Format', function () {
var fieldFormats;
diff --git a/src/ui/public/stringify/__tests__/_truncate.js b/src/ui/public/stringify/__tests__/_truncate.js
index cea68621e4de3..5a6af9eeae958 100644
--- a/src/ui/public/stringify/__tests__/_truncate.js
+++ b/src/ui/public/stringify/__tests__/_truncate.js
@@ -1,5 +1,5 @@
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import RegistryFieldFormatsProvider from 'ui/registry/field_formats';
describe('String Truncate Format', function () {
var fieldFormats;
diff --git a/src/ui/public/stringify/__tests__/_url.js b/src/ui/public/stringify/__tests__/_url.js
index 4cf2ad880a492..1c081add2615b 100644
--- a/src/ui/public/stringify/__tests__/_url.js
+++ b/src/ui/public/stringify/__tests__/_url.js
@@ -1,6 +1,6 @@
import $ from 'jquery';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import RegistryFieldFormatsProvider from 'ui/registry/field_formats';
describe('Url Format', function () {
diff --git a/src/ui/public/style_compile/__tests__/style_compile.js b/src/ui/public/style_compile/__tests__/style_compile.js
index 80d9c64291f71..6c9d34431d139 100644
--- a/src/ui/public/style_compile/__tests__/style_compile.js
+++ b/src/ui/public/style_compile/__tests__/style_compile.js
@@ -1,6 +1,6 @@
import $ from 'jquery';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
describe('styleCompile directive', function () {
var config;
diff --git a/src/ui/public/test_harness/test_harness.js b/src/ui/public/test_harness/test_harness.js
index 4e898246c888d..0568a98f340e8 100644
--- a/src/ui/public/test_harness/test_harness.js
+++ b/src/ui/public/test_harness/test_harness.js
@@ -11,7 +11,7 @@ import StackTraceMapper from 'ui/stack_trace_mapper';
import { parse } from 'url';
import $ from 'jquery';
import './test_harness.less';
-import 'ngMock';
+import 'ng_mock';
/*** the vislib tests have certain style requirements, so lets make sure they are met ***/
$('body').attr('id', 'test-harness-body'); // so we can make high priority selectors
diff --git a/src/ui/public/timefilter/__tests__/diff_interval.js b/src/ui/public/timefilter/__tests__/diff_interval.js
index 69a35ed9db3ba..fd70dfde0670c 100644
--- a/src/ui/public/timefilter/__tests__/diff_interval.js
+++ b/src/ui/public/timefilter/__tests__/diff_interval.js
@@ -1,6 +1,6 @@
import sinon from 'auto-release-sinon';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import TimefilterLibDiffIntervalProvider from 'ui/timefilter/lib/diff_interval';
describe('Timefilter service', function () {
diff --git a/src/ui/public/timefilter/__tests__/diff_time.js b/src/ui/public/timefilter/__tests__/diff_time.js
index b5a57ee883238..b5d6d7dbfb314 100644
--- a/src/ui/public/timefilter/__tests__/diff_time.js
+++ b/src/ui/public/timefilter/__tests__/diff_time.js
@@ -1,6 +1,6 @@
import sinon from 'auto-release-sinon';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import TimefilterLibDiffTimeProvider from 'ui/timefilter/lib/diff_time';
describe('Timefilter service', function () {
diff --git a/src/ui/public/url/__tests__/url.js b/src/ui/public/url/__tests__/url.js
index 59f18fc996545..2d89fde6a049e 100644
--- a/src/ui/public/url/__tests__/url.js
+++ b/src/ui/public/url/__tests__/url.js
@@ -1,7 +1,7 @@
import sinon from 'auto-release-sinon';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import faker from 'faker';
import _ from 'lodash';
import MockState from 'fixtures/mock_state';
diff --git a/src/ui/public/utils/__tests__/diff_time_picker_vals.js b/src/ui/public/utils/__tests__/diff_time_picker_vals.js
index 414dfa7a034ca..e3e5494f8336c 100644
--- a/src/ui/public/utils/__tests__/diff_time_picker_vals.js
+++ b/src/ui/public/utils/__tests__/diff_time_picker_vals.js
@@ -1,6 +1,6 @@
import moment from 'moment';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import expect from 'expect.js';
import UtilsDiffTimePickerValsProvider from 'ui/utils/diff_time_picker_vals';
diff --git a/src/ui/public/utils/__tests__/mapping_setup.js b/src/ui/public/utils/__tests__/mapping_setup.js
index 530f014a7958f..347c6c6c0b089 100644
--- a/src/ui/public/utils/__tests__/mapping_setup.js
+++ b/src/ui/public/utils/__tests__/mapping_setup.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import expect from 'expect.js';
import UtilsMappingSetupProvider from 'ui/utils/mapping_setup';
diff --git a/src/ui/public/utils/__tests__/scanner.js b/src/ui/public/utils/__tests__/scanner.js
index 9e1c89d8d7c85..202b6ff6128d8 100644
--- a/src/ui/public/utils/__tests__/scanner.js
+++ b/src/ui/public/utils/__tests__/scanner.js
@@ -2,7 +2,7 @@ import Scanner from 'ui/utils/scanner';
import expect from 'expect.js';
import Bluebird from 'bluebird';
import 'elasticsearch-browser';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import sinon from 'sinon';
describe('Scanner', function () {
diff --git a/src/ui/public/vis/__tests__/_agg_config.js b/src/ui/public/vis/__tests__/_agg_config.js
index 7b9545580bb9d..2a908485b95f7 100644
--- a/src/ui/public/vis/__tests__/_agg_config.js
+++ b/src/ui/public/vis/__tests__/_agg_config.js
@@ -1,6 +1,6 @@
import sinon from 'auto-release-sinon';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import VisProvider from 'ui/vis';
import AggTypesAggTypeProvider from 'ui/agg_types/agg_type';
import VisAggConfigProvider from 'ui/vis/agg_config';
diff --git a/src/ui/public/vis/__tests__/_agg_config_result.js b/src/ui/public/vis/__tests__/_agg_config_result.js
index be56aa0de98d6..7106942c15b08 100644
--- a/src/ui/public/vis/__tests__/_agg_config_result.js
+++ b/src/ui/public/vis/__tests__/_agg_config_result.js
@@ -1,7 +1,7 @@
import _ from 'lodash';
import AggConfigResult from 'ui/vis/agg_config_result';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import VisProvider from 'ui/vis';
import VisAggConfigProvider from 'ui/vis/agg_config';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
diff --git a/src/ui/public/vis/__tests__/_agg_configs.js b/src/ui/public/vis/__tests__/_agg_configs.js
index ee09a3f3bd3c3..6c8c11d2b33f1 100644
--- a/src/ui/public/vis/__tests__/_agg_configs.js
+++ b/src/ui/public/vis/__tests__/_agg_configs.js
@@ -1,7 +1,7 @@
import _ from 'lodash';
import sinon from 'auto-release-sinon';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import RealAggConfigPM from 'ui/vis/agg_config';
import VisProvider from 'ui/vis';
import VisAggConfigProvider from 'ui/vis/agg_config';
diff --git a/src/ui/public/vis/__tests__/_renderbot.js b/src/ui/public/vis/__tests__/_renderbot.js
index 4645e840a4292..dcdd84a38a153 100644
--- a/src/ui/public/vis/__tests__/_renderbot.js
+++ b/src/ui/public/vis/__tests__/_renderbot.js
@@ -1,5 +1,5 @@
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import VisRenderbotProvider from 'ui/vis/renderbot';
describe('renderbot', function () {
var Renderbot;
diff --git a/src/ui/public/vis/__tests__/_vis.js b/src/ui/public/vis/__tests__/_vis.js
index 9fe652cda4cc0..dba6c56f79aca 100644
--- a/src/ui/public/vis/__tests__/_vis.js
+++ b/src/ui/public/vis/__tests__/_vis.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import expect from 'expect.js';
import VisProvider from 'ui/vis';
import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
diff --git a/src/ui/public/vislib/__tests__/components/color.js b/src/ui/public/vislib/__tests__/components/color.js
index 8fb892235914d..118dd34518eae 100644
--- a/src/ui/public/vislib/__tests__/components/color.js
+++ b/src/ui/public/vislib/__tests__/components/color.js
@@ -1,6 +1,6 @@
import angular from 'angular';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import _ from 'lodash';
import d3 from 'd3';
import VislibComponentsColorSeedColorsProvider from 'ui/vislib/components/color/seed_colors';
diff --git a/src/ui/public/vislib/__tests__/components/labels.js b/src/ui/public/vislib/__tests__/components/labels.js
index e73bb27a7bbc2..39a58c2f73b9e 100644
--- a/src/ui/public/vislib/__tests__/components/labels.js
+++ b/src/ui/public/vislib/__tests__/components/labels.js
@@ -1,7 +1,7 @@
import angular from 'angular';
import _ from 'lodash';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import VislibComponentsLabelsLabelsProvider from 'ui/vislib/components/labels/labels';
import VislibComponentsLabelsDataArrayProvider from 'ui/vislib/components/labels/data_array';
import VislibComponentsLabelsUniqLabelsProvider from 'ui/vislib/components/labels/uniq_labels';
diff --git a/src/ui/public/vislib/__tests__/components/zero_injection.js b/src/ui/public/vislib/__tests__/components/zero_injection.js
index 12dbb38b4a483..8f00bc01cd1d7 100644
--- a/src/ui/public/vislib/__tests__/components/zero_injection.js
+++ b/src/ui/public/vislib/__tests__/components/zero_injection.js
@@ -2,7 +2,7 @@
import angular from 'angular';
import _ from 'lodash';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import VislibComponentsZeroInjectionInjectZerosProvider from 'ui/vislib/components/zero_injection/inject_zeros';
import VislibComponentsZeroInjectionOrderedXKeysProvider from 'ui/vislib/components/zero_injection/ordered_x_keys';
import VislibComponentsZeroInjectionUniqKeysProvider from 'ui/vislib/components/zero_injection/uniq_keys';
diff --git a/src/ui/public/vislib/__tests__/index.js b/src/ui/public/vislib/__tests__/index.js
index c47e481c28aea..58f9155b2cea4 100644
--- a/src/ui/public/vislib/__tests__/index.js
+++ b/src/ui/public/vislib/__tests__/index.js
@@ -1,7 +1,7 @@
import _ from 'lodash';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import d3 from 'd3';
import angular from 'angular';
diff --git a/src/ui/public/vislib/__tests__/lib/axis_title.js b/src/ui/public/vislib/__tests__/lib/axis_title.js
index f34ba9b8036e1..74471fa721b75 100644
--- a/src/ui/public/vislib/__tests__/lib/axis_title.js
+++ b/src/ui/public/vislib/__tests__/lib/axis_title.js
@@ -1,7 +1,7 @@
import d3 from 'd3';
import angular from 'angular';
import _ from 'lodash';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import expect from 'expect.js';
import $ from 'jquery';
import VislibLibAxisTitleProvider from 'ui/vislib/lib/axis_title';
diff --git a/src/ui/public/vislib/__tests__/lib/chart_title.js b/src/ui/public/vislib/__tests__/lib/chart_title.js
index 9ca7ac7d4d70a..a24d0ea6e9a03 100644
--- a/src/ui/public/vislib/__tests__/lib/chart_title.js
+++ b/src/ui/public/vislib/__tests__/lib/chart_title.js
@@ -1,7 +1,7 @@
import d3 from 'd3';
import angular from 'angular';
import _ from 'lodash';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import expect from 'expect.js';
import $ from 'jquery';
import VislibLibChartTitleProvider from 'ui/vislib/lib/chart_title';
diff --git a/src/ui/public/vislib/__tests__/lib/data.js b/src/ui/public/vislib/__tests__/lib/data.js
index d53c4cf5499d3..5326cbf3f8439 100644
--- a/src/ui/public/vislib/__tests__/lib/data.js
+++ b/src/ui/public/vislib/__tests__/lib/data.js
@@ -1,6 +1,6 @@
import angular from 'angular';
import _ from 'lodash';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import expect from 'expect.js';
import dataSeries from 'fixtures/vislib/mock_data/date_histogram/_series';
diff --git a/src/ui/public/vislib/__tests__/lib/dispatch.js b/src/ui/public/vislib/__tests__/lib/dispatch.js
index a70694303ee6c..e984c35d722c6 100644
--- a/src/ui/public/vislib/__tests__/lib/dispatch.js
+++ b/src/ui/public/vislib/__tests__/lib/dispatch.js
@@ -1,7 +1,7 @@
import angular from 'angular';
import _ from 'lodash';
import d3 from 'd3';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import expect from 'expect.js';
// Data
diff --git a/src/ui/public/vislib/__tests__/lib/error_handler.js b/src/ui/public/vislib/__tests__/lib/error_handler.js
index f60fc2626b051..c0e4518401e6c 100644
--- a/src/ui/public/vislib/__tests__/lib/error_handler.js
+++ b/src/ui/public/vislib/__tests__/lib/error_handler.js
@@ -1,7 +1,7 @@
import expect from 'expect.js';
import angular from 'angular';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import VislibLibErrorHandlerProvider from 'ui/vislib/lib/_error_handler';
describe('Vislib ErrorHandler Test Suite', function () {
diff --git a/src/ui/public/vislib/__tests__/lib/handler/handler.js b/src/ui/public/vislib/__tests__/lib/handler/handler.js
index 2954ef9ddaca8..52f97e60a816b 100644
--- a/src/ui/public/vislib/__tests__/lib/handler/handler.js
+++ b/src/ui/public/vislib/__tests__/lib/handler/handler.js
@@ -1,6 +1,6 @@
import angular from 'angular';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import expect from 'expect.js';
// Data
diff --git a/src/ui/public/vislib/__tests__/lib/layout/layout.js b/src/ui/public/vislib/__tests__/lib/layout/layout.js
index e4d9a8514583f..c82d506df5319 100644
--- a/src/ui/public/vislib/__tests__/lib/layout/layout.js
+++ b/src/ui/public/vislib/__tests__/lib/layout/layout.js
@@ -1,6 +1,6 @@
import d3 from 'd3';
import angular from 'angular';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import expect from 'expect.js';
// Data
diff --git a/src/ui/public/vislib/__tests__/lib/layout/layout_types.js b/src/ui/public/vislib/__tests__/lib/layout/layout_types.js
index 00383384e425b..d25635d8364e4 100644
--- a/src/ui/public/vislib/__tests__/lib/layout/layout_types.js
+++ b/src/ui/public/vislib/__tests__/lib/layout/layout_types.js
@@ -1,6 +1,6 @@
import angular from 'angular';
import _ from 'lodash';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import expect from 'expect.js';
import VislibLibLayoutLayoutTypesProvider from 'ui/vislib/lib/layout/layout_types';
diff --git a/src/ui/public/vislib/__tests__/lib/layout/splits/column_chart/splits.js b/src/ui/public/vislib/__tests__/lib/layout/splits/column_chart/splits.js
index 30a33fa145e14..7b16c4e53f34b 100644
--- a/src/ui/public/vislib/__tests__/lib/layout/splits/column_chart/splits.js
+++ b/src/ui/public/vislib/__tests__/lib/layout/splits/column_chart/splits.js
@@ -1,6 +1,6 @@
import d3 from 'd3';
import angular from 'angular';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import expect from 'expect.js';
import $ from 'jquery';
import VislibLibLayoutSplitsColumnChartChartSplitProvider from 'ui/vislib/lib/layout/splits/column_chart/chart_split';
diff --git a/src/ui/public/vislib/__tests__/lib/layout/types/column_layout.js b/src/ui/public/vislib/__tests__/lib/layout/types/column_layout.js
index f1729472bf614..de12d92b730be 100644
--- a/src/ui/public/vislib/__tests__/lib/layout/types/column_layout.js
+++ b/src/ui/public/vislib/__tests__/lib/layout/types/column_layout.js
@@ -1,7 +1,7 @@
import d3 from 'd3';
import angular from 'angular';
import _ from 'lodash';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import expect from 'expect.js';
import VislibLibLayoutLayoutTypesProvider from 'ui/vislib/lib/layout/layout_types';
diff --git a/src/ui/public/vislib/__tests__/lib/resize_checker.js b/src/ui/public/vislib/__tests__/lib/resize_checker.js
index edbabd11a2878..1c6415d3148e6 100644
--- a/src/ui/public/vislib/__tests__/lib/resize_checker.js
+++ b/src/ui/public/vislib/__tests__/lib/resize_checker.js
@@ -1,7 +1,7 @@
import $ from 'jquery';
import _ from 'lodash';
import Promise from 'bluebird';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import expect from 'expect.js';
import sinon from 'auto-release-sinon';
import VislibLibResizeCheckerProvider from 'ui/vislib/lib/resize_checker';
diff --git a/src/ui/public/vislib/__tests__/lib/x_axis.js b/src/ui/public/vislib/__tests__/lib/x_axis.js
index 0b19212b50845..387f4ce6371cd 100644
--- a/src/ui/public/vislib/__tests__/lib/x_axis.js
+++ b/src/ui/public/vislib/__tests__/lib/x_axis.js
@@ -1,7 +1,7 @@
import d3 from 'd3';
import angular from 'angular';
import _ from 'lodash';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import expect from 'expect.js';
import $ from 'jquery';
import VislibLibDataProvider from 'ui/vislib/lib/data';
diff --git a/src/ui/public/vislib/__tests__/lib/y_axis.js b/src/ui/public/vislib/__tests__/lib/y_axis.js
index 4528e32a52129..2aad3631d903b 100644
--- a/src/ui/public/vislib/__tests__/lib/y_axis.js
+++ b/src/ui/public/vislib/__tests__/lib/y_axis.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
import d3 from 'd3';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import expect from 'expect.js';
import $ from 'jquery';
import VislibLibDataProvider from 'ui/vislib/lib/data';
diff --git a/src/ui/public/vislib/__tests__/vis.js b/src/ui/public/vislib/__tests__/vis.js
index 0a2190626fb28..6ad76605189c4 100644
--- a/src/ui/public/vislib/__tests__/vis.js
+++ b/src/ui/public/vislib/__tests__/vis.js
@@ -1,7 +1,7 @@
import _ from 'lodash';
import d3 from 'd3';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import series from 'fixtures/vislib/mock_data/date_histogram/_series';
import columns from 'fixtures/vislib/mock_data/date_histogram/_columns';
diff --git a/src/ui/public/vislib/__tests__/visualizations/area_chart.js b/src/ui/public/vislib/__tests__/visualizations/area_chart.js
index feaf125d83258..32816ba83fb84 100644
--- a/src/ui/public/vislib/__tests__/visualizations/area_chart.js
+++ b/src/ui/public/vislib/__tests__/visualizations/area_chart.js
@@ -1,7 +1,7 @@
import d3 from 'd3';
import angular from 'angular';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import _ from 'lodash';
import woahLotsOfVariables from 'fixtures/vislib/mock_data/date_histogram/_series';
diff --git a/src/ui/public/vislib/__tests__/visualizations/chart.js b/src/ui/public/vislib/__tests__/visualizations/chart.js
index e112e5897eb23..9bdf27b449bf3 100644
--- a/src/ui/public/vislib/__tests__/visualizations/chart.js
+++ b/src/ui/public/vislib/__tests__/visualizations/chart.js
@@ -1,7 +1,7 @@
import d3 from 'd3';
import angular from 'angular';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import VislibVisProvider from 'ui/vislib/vis';
import VislibLibDataProvider from 'ui/vislib/lib/data';
import PersistedStatePersistedStateProvider from 'ui/persisted_state/persisted_state';
diff --git a/src/ui/public/vislib/__tests__/visualizations/column_chart.js b/src/ui/public/vislib/__tests__/visualizations/column_chart.js
index 4b2c97d7dbd0d..368b3f2cd75fe 100644
--- a/src/ui/public/vislib/__tests__/visualizations/column_chart.js
+++ b/src/ui/public/vislib/__tests__/visualizations/column_chart.js
@@ -1,7 +1,7 @@
import angular from 'angular';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import _ from 'lodash';
import d3 from 'd3';
diff --git a/src/ui/public/vislib/__tests__/visualizations/line_chart.js b/src/ui/public/vislib/__tests__/visualizations/line_chart.js
index b26fedd4ee0b9..6190309eb817e 100644
--- a/src/ui/public/vislib/__tests__/visualizations/line_chart.js
+++ b/src/ui/public/vislib/__tests__/visualizations/line_chart.js
@@ -1,7 +1,7 @@
import d3 from 'd3';
import angular from 'angular';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import _ from 'lodash';
// Data
diff --git a/src/ui/public/vislib/__tests__/visualizations/pie_chart.js b/src/ui/public/vislib/__tests__/visualizations/pie_chart.js
index 9a48e110a5587..6cd93a5d96496 100644
--- a/src/ui/public/vislib/__tests__/visualizations/pie_chart.js
+++ b/src/ui/public/vislib/__tests__/visualizations/pie_chart.js
@@ -1,7 +1,7 @@
import d3 from 'd3';
import angular from 'angular';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import _ from 'lodash';
import fixtures from 'fixtures/fake_hierarchical_data';
import $ from 'jquery';
diff --git a/src/ui/public/vislib/__tests__/visualizations/tile_maps/map.js b/src/ui/public/vislib/__tests__/visualizations/tile_maps/map.js
index b0876c102512e..645c22f98e1ac 100644
--- a/src/ui/public/vislib/__tests__/visualizations/tile_maps/map.js
+++ b/src/ui/public/vislib/__tests__/visualizations/tile_maps/map.js
@@ -1,6 +1,6 @@
import angular from 'angular';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import _ from 'lodash';
import L from 'leaflet';
diff --git a/src/ui/public/vislib/__tests__/visualizations/tile_maps/markers.js b/src/ui/public/vislib/__tests__/visualizations/tile_maps/markers.js
index 24d8378f96a5e..b36c4ccdb9548 100644
--- a/src/ui/public/vislib/__tests__/visualizations/tile_maps/markers.js
+++ b/src/ui/public/vislib/__tests__/visualizations/tile_maps/markers.js
@@ -1,7 +1,7 @@
import angular from 'angular';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import _ from 'lodash';
import L from 'leaflet';
import sinon from 'auto-release-sinon';
diff --git a/src/ui/public/vislib/__tests__/visualizations/tile_maps/tile_map.js b/src/ui/public/vislib/__tests__/visualizations/tile_maps/tile_map.js
index b4199a4e2dae6..bf807fd8ca49e 100644
--- a/src/ui/public/vislib/__tests__/visualizations/tile_maps/tile_map.js
+++ b/src/ui/public/vislib/__tests__/visualizations/tile_maps/tile_map.js
@@ -1,6 +1,6 @@
import angular from 'angular';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import _ from 'lodash';
import sinon from 'auto-release-sinon';
diff --git a/src/ui/public/vislib/__tests__/visualizations/time_marker.js b/src/ui/public/vislib/__tests__/visualizations/time_marker.js
index 8fafcf8398434..4385e1f72b9ce 100644
--- a/src/ui/public/vislib/__tests__/visualizations/time_marker.js
+++ b/src/ui/public/vislib/__tests__/visualizations/time_marker.js
@@ -1,7 +1,7 @@
import d3 from 'd3';
import angular from 'angular';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import _ from 'lodash';
import fixtures from 'fixtures/fake_hierarchical_data';
import series from 'fixtures/vislib/mock_data/date_histogram/_series';
diff --git a/src/ui/public/vislib/__tests__/visualizations/vis_types.js b/src/ui/public/vislib/__tests__/visualizations/vis_types.js
index 02f4189086d96..2b8268d98c1ac 100644
--- a/src/ui/public/vislib/__tests__/visualizations/vis_types.js
+++ b/src/ui/public/vislib/__tests__/visualizations/vis_types.js
@@ -1,6 +1,6 @@
import angular from 'angular';
import expect from 'expect.js';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import _ from 'lodash';
import VislibVisualizationsVisTypesProvider from 'ui/vislib/visualizations/vis_types';
diff --git a/src/ui/public/vislib_vis_type/__tests__/_build_chart_data.js b/src/ui/public/vislib_vis_type/__tests__/_build_chart_data.js
index 4d9e007fb8425..62ec8a1a1ace1 100644
--- a/src/ui/public/vislib_vis_type/__tests__/_build_chart_data.js
+++ b/src/ui/public/vislib_vis_type/__tests__/_build_chart_data.js
@@ -1,5 +1,5 @@
import _ from 'lodash';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import expect from 'expect.js';
import sinon from 'auto-release-sinon';
import AggResponseTabifyTableProvider from 'ui/agg_response/tabify/_table';
diff --git a/src/ui/public/vislib_vis_type/__tests__/_vislib_renderbot.js b/src/ui/public/vislib_vis_type/__tests__/_vislib_renderbot.js
index 4492b246211ec..9805fc5af46c5 100644
--- a/src/ui/public/vislib_vis_type/__tests__/_vislib_renderbot.js
+++ b/src/ui/public/vislib_vis_type/__tests__/_vislib_renderbot.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
import $ from 'jquery';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import expect from 'expect.js';
import sinon from 'auto-release-sinon';
import VislibProvider from 'ui/vislib';
diff --git a/src/ui/public/watch_multi/__tests__/watch_multi.js b/src/ui/public/watch_multi/__tests__/watch_multi.js
index a15cbd0ea634b..ed0f60a2e9a08 100644
--- a/src/ui/public/watch_multi/__tests__/watch_multi.js
+++ b/src/ui/public/watch_multi/__tests__/watch_multi.js
@@ -1,6 +1,6 @@
import _ from 'lodash';
-import ngMock from 'ngMock';
+import ngMock from 'ng_mock';
import expect from 'expect.js';
import sinon from 'auto-release-sinon';
From 0574f59d2468f55847eeeb9227d1b6290405448f Mon Sep 17 00:00:00 2001
From: spalger <spalger@users.noreply.github.com>
Date: Thu, 10 Mar 2016 11:40:21 -0700
Subject: [PATCH 10/12] [grunt] require opt-into different task name
---
Gruntfile.js | 9 +++++----
tasks/config/download_selenium.js | 2 ++
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/Gruntfile.js b/Gruntfile.js
index a0be7e3b42934..c961cf21455e9 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -85,11 +85,12 @@ module.exports = function (grunt) {
},
preMerge(config, data) {
Object.keys(config).forEach(key => {
- const camelKey = camelCase(key);
- if (key !== camelKey) {
- grunt.log.debug(`renaming config for ${key} to ${camelKey}`);
- config[camelKey] = config[key];
+ const taskConfig = config[key];
+ if (taskConfig.__taskName__) {
+ config[taskConfig.__taskName__] = taskConfig;
+
delete config[key];
+ delete taskConfig.__taskName__;
}
});
}
diff --git a/tasks/config/download_selenium.js b/tasks/config/download_selenium.js
index d69fa8d406276..a403c242fb829 100644
--- a/tasks/config/download_selenium.js
+++ b/tasks/config/download_selenium.js
@@ -3,6 +3,8 @@ var path = require('path');
module.exports = function (grunt) {
return {
+ __taskName__: 'downloadSelenium',
+
options: {
selenium: {
filename: 'selenium-server-standalone-2.48.2.jar',
From 8d497f6999e368a598f79f6dbd86ef129ef7cf40 Mon Sep 17 00:00:00 2001
From: spalger <spalger@users.noreply.github.com>
Date: Thu, 10 Mar 2016 12:42:45 -0700
Subject: [PATCH 11/12] [es6ify] gruntfile
---
Gruntfile.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Gruntfile.js b/Gruntfile.js
index c961cf21455e9..95582d40d5a15 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,11 +1,11 @@
-var camelCase = require('lodash').camelCase;
+const camelCase = require('lodash').camelCase;
require('babel/register')(require('./src/optimize/babel_options').node);
module.exports = function (grunt) {
// set the config once before calling load-grunt-config
// and once during so that we have access to it via
// grunt.config.get() within the config files
- var config = {
+ const config = {
pkg: grunt.file.readJSON('package.json'),
root: __dirname,
src: __dirname + '/src',
From caf7331a484bf100fd84cf9fcaff64f5b17599e4 Mon Sep 17 00:00:00 2001
From: spalger <spalger@users.noreply.github.com>
Date: Fri, 11 Mar 2016 16:42:19 -0700
Subject: [PATCH 12/12] [filenames] allow rule-breaking in docs, tasks/config,
and webpackShims
---
Gruntfile.js | 11 -----------
tasks/check_added_filenames.js | 3 ++-
.../{download_selenium.js => downloadSelenium.js} | 2 --
3 files changed, 2 insertions(+), 14 deletions(-)
rename tasks/config/{download_selenium.js => downloadSelenium.js} (90%)
diff --git a/Gruntfile.js b/Gruntfile.js
index 95582d40d5a15..3f510761549f2 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -82,17 +82,6 @@ module.exports = function (grunt) {
config: config,
loadGruntTasks: {
pattern: ['grunt-*', '@*/grunt-*', 'gruntify-*', '@*/gruntify-*', 'intern']
- },
- preMerge(config, data) {
- Object.keys(config).forEach(key => {
- const taskConfig = config[key];
- if (taskConfig.__taskName__) {
- config[taskConfig.__taskName__] = taskConfig;
-
- delete config[key];
- delete taskConfig.__taskName__;
- }
- });
}
});
diff --git a/tasks/check_added_filenames.js b/tasks/check_added_filenames.js
index be3a2ef2f865d..8d132c4b11e7c 100644
--- a/tasks/check_added_filenames.js
+++ b/tasks/check_added_filenames.js
@@ -6,8 +6,9 @@ export default function registerCheckAddedFilenames(grunt) {
const invalid = grunt.config
.get('filesToCommit')
- .filter(isAdded)
.map(getFilename)
+ .filter(isAdded)
+ .filter(name => !name.match(/([\/\\]|^)(docs|tasks[\/\\]config|webpackShims)([\/\\]|$)/))
.filter(name => name.match(/[A-Z \-]/))
.reduce((all, name) => `${all} ${name}\n`, '');
diff --git a/tasks/config/download_selenium.js b/tasks/config/downloadSelenium.js
similarity index 90%
rename from tasks/config/download_selenium.js
rename to tasks/config/downloadSelenium.js
index a403c242fb829..d69fa8d406276 100644
--- a/tasks/config/download_selenium.js
+++ b/tasks/config/downloadSelenium.js
@@ -3,8 +3,6 @@ var path = require('path');
module.exports = function (grunt) {
return {
- __taskName__: 'downloadSelenium',
-
options: {
selenium: {
filename: 'selenium-server-standalone-2.48.2.jar',