rename container->component android

lib/android/app/src/main/java/com/reactnativenavigation/anim/StackAnimator.java

@@ -113,19 +113,19 @@ public class StackAnimator {
 		return metrics.heightPixels;
 	}
 
-	public void animateShowTopBar(final TopBar topBar, final View container) {
-		ValueAnimator containerHeightAnim = ValueAnimator.ofInt(container.getMeasuredHeight(), container.getMeasuredHeight() - topBar.getMeasuredHeight());
-		containerHeightAnim.setInterpolator(DECELERATE_INTERPOLATOR);
-		containerHeightAnim.setDuration(DURATION_TOPBAR);
-		containerHeightAnim.addUpdateListener(valueAnimator -> {
+	public void animateShowTopBar(final TopBar topBar, final View component) {
+		ValueAnimator componentHeightAnim = ValueAnimator.ofInt(component.getMeasuredHeight(), component.getMeasuredHeight() - topBar.getMeasuredHeight());
+		componentHeightAnim.setInterpolator(DECELERATE_INTERPOLATOR);
+		componentHeightAnim.setDuration(DURATION_TOPBAR);
+		componentHeightAnim.addUpdateListener(valueAnimator -> {
             int val = (Integer) valueAnimator.getAnimatedValue();
-			ViewGroup.LayoutParams layoutParams = container.getLayoutParams();
+			ViewGroup.LayoutParams layoutParams = component.getLayoutParams();
             layoutParams.height = val;
-            container.setLayoutParams(layoutParams);
+            component.setLayoutParams(layoutParams);
         });
-		ObjectAnimator containerTransitionAnim = ObjectAnimator.ofFloat(container, View.TRANSLATION_Y, -1 * topBar.getMeasuredHeight(), 0);
-		containerTransitionAnim.setInterpolator(DECELERATE_INTERPOLATOR);
-		containerTransitionAnim.setDuration(DURATION_TOPBAR);
+		ObjectAnimator componentTransitionAnim = ObjectAnimator.ofFloat(component, View.TRANSLATION_Y, -1 * topBar.getMeasuredHeight(), 0);
+		componentTransitionAnim.setInterpolator(DECELERATE_INTERPOLATOR);
+		componentTransitionAnim.setDuration(DURATION_TOPBAR);
 
 		ObjectAnimator topbarAnim = ObjectAnimator.ofFloat(topBar, View.TRANSLATION_Y, -1 * topBar.getHeight(), 0);
 		topbarAnim.setInterpolator(DECELERATE_INTERPOLATOR);
@@ -140,9 +140,9 @@ public class StackAnimator {
 
 			@Override
 			public void onAnimationEnd(Animator animation) {
-                ViewGroup.LayoutParams layoutParams = container.getLayoutParams();
+                ViewGroup.LayoutParams layoutParams = component.getLayoutParams();
 				layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT;
-				container.setLayoutParams(layoutParams);
+				component.setLayoutParams(layoutParams);
 			}
 
 			@Override
@@ -155,23 +155,23 @@ public class StackAnimator {
 
 			}
 		});
-		set.playTogether(containerHeightAnim, containerTransitionAnim, topbarAnim);
+		set.playTogether(componentHeightAnim, componentTransitionAnim, topbarAnim);
 		set.start();
 	}
 
-	public void animateHideTopBar(final TopBar topBar, final View container) {
-		ValueAnimator containerHeightAnim = ValueAnimator.ofInt(container.getMeasuredHeight(), container.getMeasuredHeight() + topBar.getMeasuredHeight());
-		containerHeightAnim.setInterpolator(ACCELERATE_INTERPOLATOR);
-		containerHeightAnim.setDuration(DURATION_TOPBAR);
-		containerHeightAnim.addUpdateListener(valueAnimator -> {
+	public void animateHideTopBar(final TopBar topBar, final View component) {
+		ValueAnimator componentHeightAnim = ValueAnimator.ofInt(component.getMeasuredHeight(), component.getMeasuredHeight() + topBar.getMeasuredHeight());
+		componentHeightAnim.setInterpolator(ACCELERATE_INTERPOLATOR);
+		componentHeightAnim.setDuration(DURATION_TOPBAR);
+		componentHeightAnim.addUpdateListener(valueAnimator -> {
             int val = (Integer) valueAnimator.getAnimatedValue();
-			ViewGroup.LayoutParams layoutParams = container.getLayoutParams();
+			ViewGroup.LayoutParams layoutParams = component.getLayoutParams();
             layoutParams.height = val;
-            container.setLayoutParams(layoutParams);
+            component.setLayoutParams(layoutParams);
         });
-		ObjectAnimator containerTransitionAnim = ObjectAnimator.ofFloat(container, View.TRANSLATION_Y, 0, -1 * topBar.getMeasuredHeight());
-		containerTransitionAnim.setInterpolator(ACCELERATE_INTERPOLATOR);
-		containerTransitionAnim.setDuration(DURATION_TOPBAR);
+		ObjectAnimator componentTransitionAnim = ObjectAnimator.ofFloat(component, View.TRANSLATION_Y, 0, -1 * topBar.getMeasuredHeight());
+		componentTransitionAnim.setInterpolator(ACCELERATE_INTERPOLATOR);
+		componentTransitionAnim.setDuration(DURATION_TOPBAR);
 
 		ObjectAnimator topbarAnim = ObjectAnimator.ofFloat(topBar, View.TRANSLATION_Y, 0, -1 * topBar.getMeasuredHeight());
 		topbarAnim.setInterpolator(ACCELERATE_INTERPOLATOR);
@@ -185,10 +185,10 @@ public class StackAnimator {
 
 			@Override
 			public void onAnimationEnd(Animator animation) {
-                ViewGroup.LayoutParams layoutParams = container.getLayoutParams();
+                ViewGroup.LayoutParams layoutParams = component.getLayoutParams();
 				layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT;
-				container.setLayoutParams(layoutParams);
-				container.setTranslationY(0);
+				component.setLayoutParams(layoutParams);
+				component.setTranslationY(0);
 
 				topBar.setVisibility(View.GONE);
 				topBar.setTranslationY(0);
@@ -204,7 +204,7 @@ public class StackAnimator {
 
 			}
 		});
-		set.playTogether(containerHeightAnim, containerTransitionAnim, topbarAnim);
+		set.playTogether(componentHeightAnim, componentTransitionAnim, topbarAnim);
 		set.start();
 	}
 }

lib/android/app/src/main/java/com/reactnativenavigation/parse/LayoutFactory.java

@@ -3,17 +3,17 @@ package com.reactnativenavigation.parse;
 import android.app.Activity;
 
 import com.facebook.react.ReactInstanceManager;
-import com.reactnativenavigation.react.ReactContainerViewCreator;
+import com.reactnativenavigation.react.ReactComponentViewCreator;
 import com.reactnativenavigation.utils.TypefaceLoader;
 import com.reactnativenavigation.viewcontrollers.BottomTabsController;
-import com.reactnativenavigation.viewcontrollers.ContainerViewController;
+import com.reactnativenavigation.viewcontrollers.ComponentViewController;
 import com.reactnativenavigation.viewcontrollers.SideMenuController;
 import com.reactnativenavigation.viewcontrollers.StackController;
 import com.reactnativenavigation.viewcontrollers.ViewController;
 import com.reactnativenavigation.viewcontrollers.overlay.DialogViewController;
 import com.reactnativenavigation.viewcontrollers.toptabs.TopTabController;
 import com.reactnativenavigation.viewcontrollers.toptabs.TopTabsController;
-import com.reactnativenavigation.views.ContainerViewCreator;
+import com.reactnativenavigation.views.ComponentViewCreator;
 import com.reactnativenavigation.views.TopTabsLayoutCreator;
 
 import java.util.ArrayList;
@@ -35,10 +35,10 @@ public class LayoutFactory {
 
 	public ViewController create(final LayoutNode node) {
 		switch (node.type) {
-			case Container:
-				return createContainer(node);
-			case ContainerStack:
-				return createContainerStack(node);
+			case Component:
+				return createComponent(node);
+			case ComponentStack:
+				return createComponentStack(node);
 			case BottomTabs:
 				return createBottomTabs(node);
 			case SideMenuRoot:
@@ -50,7 +50,7 @@ public class LayoutFactory {
 			case SideMenuRight:
 				return createSideMenuRight(node);
 			case CustomDialog:
-				return createDialogContainer(node);
+				return createDialogComponent(node);
             case TopTabs:
                 return createTopTabs(node);
             case TopTab:
@@ -93,19 +93,19 @@ public class LayoutFactory {
 		return create(node.children.get(0));
 	}
 
-	private ViewController createContainer(LayoutNode node) {
+	private ViewController createComponent(LayoutNode node) {
 		String id = node.id;
 		String name = node.data.optString("name");
 		NavigationOptions navigationOptions = NavigationOptions.parse(typefaceManager, node.data.optJSONObject("navigationOptions"), defaultOptions);
-		return new ContainerViewController(activity,
+		return new ComponentViewController(activity,
                 id,
                 name,
-                new ContainerViewCreator(reactInstanceManager),
+                new ComponentViewCreator(reactInstanceManager),
                 navigationOptions
         );
 	}
 
-	private ViewController createContainerStack(LayoutNode node) {
+	private ViewController createComponentStack(LayoutNode node) {
 		StackController stackController = new StackController(activity, node.id);
 		for (LayoutNode child : node.children) {
 			stackController.push(create(child), null);
@@ -114,19 +114,19 @@ public class LayoutFactory {
 	}
 
 	private ViewController createBottomTabs(LayoutNode node) {
-		final BottomTabsController tabsContainer = new BottomTabsController(activity, node.id);
+		final BottomTabsController tabsComponent = new BottomTabsController(activity, node.id);
 		List<ViewController> tabs = new ArrayList<>();
 		for (int i = 0; i < node.children.size(); i++) {
 			tabs.add(create(node.children.get(i)));
 		}
-		tabsContainer.setTabs(tabs);
-		return tabsContainer;
+		tabsComponent.setTabs(tabs);
+		return tabsComponent;
 	}
 
-	private ViewController createDialogContainer(LayoutNode node) {
+	private ViewController createDialogComponent(LayoutNode node) {
 		String id = node.id;
 		String name = node.data.optString("name");
-		ReactContainerViewCreator creator = new ReactContainerViewCreator(reactInstanceManager);
+		ReactComponentViewCreator creator = new ReactComponentViewCreator(reactInstanceManager);
 		return new DialogViewController(activity, id, name, creator);
 	}
 
@@ -148,7 +148,7 @@ public class LayoutFactory {
         return new TopTabController(activity,
                 id,
                 name,
-                new ReactContainerViewCreator(reactInstanceManager),
+                new ReactComponentViewCreator(reactInstanceManager),
                 navigationOptions
         );
     }

lib/android/app/src/main/java/com/reactnativenavigation/parse/LayoutNode.java

@@ -7,8 +7,8 @@ import java.util.List;
 
 public class LayoutNode {
 	public enum Type {
-		Container,
-		ContainerStack,
+		Component,
+		ComponentStack,
 		BottomTabs,
 		SideMenuRoot,
 		SideMenuCenter,

lib/android/app/src/main/java/com/reactnativenavigation/parse/OverlayOptions.java

@@ -27,11 +27,11 @@ public class OverlayOptions {
 		return options;
 	}
 
-	public static OverlayOptions create(ViewController containerView) {
+	public static OverlayOptions create(ViewController componentView) {
 		OverlayOptions options = new OverlayOptions();
-		if (containerView == null) return options;
+		if (componentView == null) return options;
 
-		options.customView = containerView;
+		options.customView = componentView;
 		return options;
 	}
 

lib/android/app/src/main/java/com/reactnativenavigation/react/NavigationEvent.java

@@ -13,8 +13,8 @@ import static com.facebook.react.modules.core.DeviceEventManagerModule.RCTDevice
 
 public class NavigationEvent {
 	private static final String onAppLaunched = "RNN.appLaunched";
-	private static final String containerDidAppear = "RNN.containerDidAppear";
-	private static final String containerDidDisappear = "RNN.containerDidDisappear";
+	private static final String componentDidAppear = "RNN.componentDidAppear";
+	private static final String componentDidDisappear = "RNN.componentDidDisappear";
 	private static final String onNavigationButtonPressed = "RNN.navigationButtonPressed";
 
 	private final RCTDeviceEventEmitter emitter;
@@ -27,17 +27,17 @@ public class NavigationEvent {
 		emit(onAppLaunched);
 	}
 
-	public void containerDidDisappear(String id) {
-		emit(containerDidDisappear, id);
+	public void componentDidDisappear(String id) {
+		emit(componentDidDisappear, id);
 	}
 
-	public void containerDidAppear(String id) {
-		emit(containerDidAppear, id);
+	public void componentDidAppear(String id) {
+		emit(componentDidAppear, id);
 	}
 
 	public void sendOnNavigationButtonPressed(String id, String buttonId) {
 		WritableMap map = Arguments.createMap();
-		map.putString("containerId", id);
+		map.putString("componentId", id);
 		map.putString("buttonId", buttonId);
 
 		emit(onNavigationButtonPressed, map);

lib/android/app/src/main/java/com/reactnativenavigation/react/NavigationModule.java

@@ -52,33 +52,33 @@ public class NavigationModule extends ReactContextBaseJavaModule {
     }
 
 	@ReactMethod
-	public void setOptions(final String onContainerId, final ReadableMap options) {
+	public void setOptions(final String onComponentId, final ReadableMap options) {
 		final NavigationOptions navOptions = NavigationOptions.parse(new TypefaceLoader(activity()), JSONParser.parse(options));
-		handle(() -> navigator().setOptions(onContainerId, navOptions));
+		handle(() -> navigator().setOptions(onComponentId, navOptions));
 	}
 
 	@ReactMethod
-	public void push(final String onContainerId, final ReadableMap rawLayoutTree, final Promise promise) {
+	public void push(final String onComponentId, final ReadableMap rawLayoutTree, final Promise promise) {
 		final LayoutNode layoutTree = LayoutNodeParser.parse(JSONParser.parse(rawLayoutTree));
 		handle(() -> {
             final ViewController viewController = newLayoutFactory().create(layoutTree);
-            navigator().push(onContainerId, viewController, promise);
+            navigator().push(onComponentId, viewController, promise);
         });
 	}
 
 	@ReactMethod
-	public void pop(final String onContainerId, final ReadableMap options, final Promise promise) {
-		handle(() -> navigator().popSpecific(onContainerId, promise));
+	public void pop(final String onComponentId, final ReadableMap options, final Promise promise) {
+		handle(() -> navigator().popSpecific(onComponentId, promise));
 	}
 
 	@ReactMethod
-	public void popTo(final String containerId, final Promise promise) {
-		handle(() -> navigator().popTo(containerId, promise));
+	public void popTo(final String componentId, final Promise promise) {
+		handle(() -> navigator().popTo(componentId, promise));
 	}
 
 	@ReactMethod
-	public void popToRoot(final String containerId, final Promise promise) {
-		handle(() -> navigator().popToRoot(containerId, promise));
+	public void popToRoot(final String componentId, final Promise promise) {
+		handle(() -> navigator().popToRoot(componentId, promise));
 	}
 
 	@ReactMethod
@@ -91,8 +91,8 @@ public class NavigationModule extends ReactContextBaseJavaModule {
 	}
 
 	@ReactMethod
-	public void dismissModal(final String containerId, final Promise promise) {
-		handle(() -> navigator().dismissModal(containerId, promise));
+	public void dismissModal(final String componentId, final Promise promise) {
+		handle(() -> navigator().dismissModal(componentId, promise));
 	}
 
 	@ReactMethod

lib/android/app/src/main/java/com/reactnativenavigation/react/ReactComponentViewCreator.java

@@ -0,0 +1,20 @@
+package com.reactnativenavigation.react;
+
+import android.app.Activity;
+
+import com.facebook.react.ReactInstanceManager;
+import com.reactnativenavigation.viewcontrollers.ComponentViewController;
+import com.reactnativenavigation.viewcontrollers.ComponentViewController.ReactViewCreator;
+
+public class ReactComponentViewCreator implements ReactViewCreator {
+	private ReactInstanceManager reactInstanceManager;
+
+	public ReactComponentViewCreator(final ReactInstanceManager reactInstanceManager) {
+		this.reactInstanceManager = reactInstanceManager;
+	}
+
+	@Override
+	public ComponentViewController.IReactView create(final Activity activity, final String componentId, final String componentName) {
+		return new ReactView(activity, reactInstanceManager, componentId, componentName);
+	}
+}

lib/android/app/src/main/java/com/reactnativenavigation/react/ReactContainerViewCreator.java

@@ -1,20 +0,0 @@
-package com.reactnativenavigation.react;
-
-import android.app.Activity;
-
-import com.facebook.react.ReactInstanceManager;
-import com.reactnativenavigation.viewcontrollers.ContainerViewController;
-import com.reactnativenavigation.viewcontrollers.ContainerViewController.ReactViewCreator;
-
-public class ReactContainerViewCreator implements ReactViewCreator {
-	private ReactInstanceManager reactInstanceManager;
-
-	public ReactContainerViewCreator(final ReactInstanceManager reactInstanceManager) {
-		this.reactInstanceManager = reactInstanceManager;
-	}
-
-	@Override
-	public ContainerViewController.IReactView create(final Activity activity, final String containerId, final String containerName) {
-		return new ReactView(activity, reactInstanceManager, containerId, containerName);
-	}
-}

lib/android/app/src/main/java/com/reactnativenavigation/react/ReactView.java

@@ -7,21 +7,21 @@ import android.view.View;
 
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactRootView;
-import com.reactnativenavigation.viewcontrollers.ContainerViewController;
+import com.reactnativenavigation.viewcontrollers.ComponentViewController;
 
 @SuppressLint("ViewConstructor")
-public class ReactView extends ReactRootView implements ContainerViewController.IReactView {
+public class ReactView extends ReactRootView implements ComponentViewController.IReactView {
 
 	private final ReactInstanceManager reactInstanceManager;
-	private final String containerId;
-	private final String containerName;
+	private final String componentId;
+	private final String componentName;
 	private boolean isAttachedToReactInstance = false;
 
-	public ReactView(final Context context, ReactInstanceManager reactInstanceManager, String containerId, String containerName) {
+	public ReactView(final Context context, ReactInstanceManager reactInstanceManager, String componentId, String componentName) {
 		super(context);
 		this.reactInstanceManager = reactInstanceManager;
-		this.containerId = containerId;
-		this.containerName = containerName;
+		this.componentId = componentId;
+		this.componentName = componentName;
 		start();
 	}
 
@@ -31,8 +31,8 @@ public class ReactView extends ReactRootView implements ContainerViewController.
             isAttachedToReactInstance = true;
         });
 		final Bundle opts = new Bundle();
-		opts.putString("containerId", containerId);
-		startReactApplication(reactInstanceManager, containerName, opts);
+		opts.putString("componentId", componentId);
+		startReactApplication(reactInstanceManager, componentName, opts);
 	}
 
 	@Override
@@ -51,17 +51,17 @@ public class ReactView extends ReactRootView implements ContainerViewController.
 	}
 
 	@Override
-	public void sendContainerStart() {
-		new NavigationEvent(reactInstanceManager.getCurrentReactContext()).containerDidAppear(containerId);
+	public void sendComponentStart() {
+		new NavigationEvent(reactInstanceManager.getCurrentReactContext()).componentDidAppear(componentId);
 	}
 
 	@Override
-	public void sendContainerStop() {
-		new NavigationEvent(reactInstanceManager.getCurrentReactContext()).containerDidDisappear(containerId);
+	public void sendComponentStop() {
+		new NavigationEvent(reactInstanceManager.getCurrentReactContext()).componentDidDisappear(componentId);
 	}
 
     @Override
 	public void sendOnNavigationButtonPressed(String buttonId) {
-		new NavigationEvent(reactInstanceManager.getCurrentReactContext()).sendOnNavigationButtonPressed(containerId, buttonId);
+		new NavigationEvent(reactInstanceManager.getCurrentReactContext()).sendOnNavigationButtonPressed(componentId, buttonId);
 	}
 }

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/ContainerViewController.java → lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/ComponentViewController.java

@@ -7,14 +7,14 @@ import android.view.View;
 
 import com.reactnativenavigation.parse.NavigationOptions;
 import com.reactnativenavigation.presentation.NavigationOptionsListener;
-import com.reactnativenavigation.views.ReactContainer;
+import com.reactnativenavigation.views.ReactComponent;
 import com.reactnativenavigation.views.TopBar;
 
-public class ContainerViewController extends ViewController implements NavigationOptionsListener {
+public class ComponentViewController extends ViewController implements NavigationOptionsListener {
 
     public interface ReactViewCreator {
 
-        IReactView create(Activity activity, String containerId, String containerName);
+        IReactView create(Activity activity, String componentId, String componentName);
 	}
 
 	public interface IReactView {
@@ -25,72 +25,72 @@ public class ContainerViewController extends ViewController implements Navigatio
 
 		void destroy();
 
-		void sendContainerStart();
+		void sendComponentStart();
 
-		void sendContainerStop();
+		void sendComponentStop();
 
         void sendOnNavigationButtonPressed(String buttonId);
     }
 
-	private final String containerName;
+	private final String componentName;
 
 	private final ReactViewCreator viewCreator;
 	private NavigationOptions navigationOptions;
-	private ReactContainer container;
+	private ReactComponent component;
 
-	public ContainerViewController(final Activity activity,
+	public ComponentViewController(final Activity activity,
 								   final String id,
-								   final String containerName,
+								   final String componentName,
 								   final ReactViewCreator viewCreator,
 								   final NavigationOptions initialNavigationOptions) {
 		super(activity, id);
-		this.containerName = containerName;
+		this.componentName = componentName;
 		this.viewCreator = viewCreator;
 		this.navigationOptions = initialNavigationOptions;
 	}
 
     @RestrictTo(RestrictTo.Scope.TESTS)
     TopBar getTopBar() {
-        return container.getTopBar();
+        return component.getTopBar();
     }
 
 	@Override
 	public void destroy() {
 		super.destroy();
-		if (container != null) container.destroy();
-		container = null;
+		if (component != null) component.destroy();
+		component = null;
 	}
 
 	@Override
 	public void onViewAppeared() {
 		super.onViewAppeared();
 		ensureViewIsCreated();
-		container.applyOptions(navigationOptions);
-		container.sendContainerStart();
+		component.applyOptions(navigationOptions);
+		component.sendComponentStart();
 	}
 
 	@Override
 	public void onViewDisappear() {
 		super.onViewDisappear();
-		container.sendContainerStop();
+		component.sendComponentStop();
 	}
 
 	@Override
 	protected boolean isViewShown() {
-		return super.isViewShown() && container.isReady();
+		return super.isViewShown() && component.isReady();
 	}
 
 	@NonNull
 	@Override
 	protected View createView() {
-		container = (ReactContainer) viewCreator.create(getActivity(), getId(), containerName);
-        return container.asView();
+		component = (ReactComponent) viewCreator.create(getActivity(), getId(), componentName);
+        return component.asView();
 	}
 
 	@Override
 	public void mergeNavigationOptions(NavigationOptions options) {
 		navigationOptions.mergeWith(options);
-        container.applyOptions(navigationOptions);
+        component.applyOptions(navigationOptions);
 	}
 
 	NavigationOptions getNavigationOptions() {

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/ModalStack.java

@@ -26,13 +26,13 @@ public class ModalStack {
 		}
 	}
 
-	public void dismissModal(final String containerId, Promise promise) {
-		Modal modal = findModalByContainerId(containerId);
+	public void dismissModal(final String componentId, Promise promise) {
+		Modal modal = findModalByComponentId(componentId);
 		if (modal != null) {
 			modal.dismiss();
 			modals.remove(modal);
 			if (promise != null) {
-				promise.resolve(containerId);
+				promise.resolve(componentId);
 			}
 		} else {
 			Navigator.rejectPromise(promise);
@@ -50,9 +50,9 @@ public class ModalStack {
 	}
 
 	@Nullable
-	private Modal findModalByContainerId(String containerId) {
+	private Modal findModalByComponentId(String componentId) {
 		for (Modal modal : modals) {
-			if (modal.containsDeepContainerId(containerId)) {
+			if (modal.containsDeepComponentId(componentId)) {
 				return modal;
 			}
 		}
@@ -78,8 +78,8 @@ public class ModalStack {
 			dialog.dismiss();
 		}
 
-		boolean containsDeepContainerId(String containerId) {
-			return viewController.findControllerById(containerId) != null;
+		boolean containsDeepComponentId(String componentId) {
+			return viewController.findControllerById(componentId) != null;
 		}
 
 		private void preMeasureView() {

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/Navigator.java

@@ -77,8 +77,8 @@ public class Navigator extends ParentController {
         return defaultOptions;
     }
 
-	public void setOptions(final String containerId, NavigationOptions options) {
-		ViewController target = findControllerById(containerId);
+	public void setOptions(final String componentId, NavigationOptions options) {
+		ViewController target = findControllerById(componentId);
 		if (target instanceof NavigationOptionsListener) {
 			((NavigationOptionsListener) target).mergeNavigationOptions(options);
 		}
@@ -133,12 +133,12 @@ public class Navigator extends ParentController {
 		}
 	}
 
-	void popTo(final String containerId) {
-		popTo(containerId, null);
+	void popTo(final String componentId) {
+		popTo(componentId, null);
 	}
 
-	public void popTo(final String containerId, Promise promise) {
-		ViewController target = findControllerById(containerId);
+	public void popTo(final String componentId, Promise promise) {
+		ViewController target = findControllerById(componentId);
 		if (target != null) {
 		    target.performOnParentStack(stack -> stack.popTo(target, promise), () -> rejectPromise(promise));
 		} else {
@@ -150,8 +150,8 @@ public class Navigator extends ParentController {
 		modalStack.showModal(viewController, promise);
 	}
 
-	public void dismissModal(final String containerId, Promise promise) {
-		modalStack.dismissModal(containerId, promise);
+	public void dismissModal(final String componentId, Promise promise) {
+		modalStack.dismissModal(componentId, promise);
 	}
 
 	public void dismissAllModals(Promise promise) {

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/overlay/CustomOverlay.java

@@ -4,7 +4,7 @@ package com.reactnativenavigation.viewcontrollers.overlay;
 import android.content.Context;
 
 import com.reactnativenavigation.parse.OverlayOptions;
-import com.reactnativenavigation.viewcontrollers.ContainerViewController;
+import com.reactnativenavigation.viewcontrollers.ComponentViewController;
 import com.reactnativenavigation.viewcontrollers.ViewController;
 import com.reactnativenavigation.views.CustomDialog;
 

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/overlay/DialogViewController.java

@@ -4,24 +4,24 @@ import android.app.Activity;
 import android.support.annotation.NonNull;
 import android.view.View;
 
-import com.reactnativenavigation.viewcontrollers.ContainerViewController;
+import com.reactnativenavigation.viewcontrollers.ComponentViewController;
 import com.reactnativenavigation.viewcontrollers.ViewController;
 
 
 public class DialogViewController extends ViewController {
 
-	private ContainerViewController.ReactViewCreator viewCreator;
-	private String containerName;
+	private ComponentViewController.ReactViewCreator viewCreator;
+	private String componentName;
 
-	public DialogViewController(Activity activity, String id, String containerName, ContainerViewController.ReactViewCreator viewCreator) {
+	public DialogViewController(Activity activity, String id, String componentName, ComponentViewController.ReactViewCreator viewCreator) {
 		super(activity, id);
 		this.viewCreator = viewCreator;
-		this.containerName = containerName;
+		this.componentName = componentName;
 	}
 
 	@NonNull
 	@Override
 	protected View createView() {
-		return viewCreator.create(getActivity(), getId(), containerName).asView();
+		return viewCreator.create(getActivity(), getId(), componentName).asView();
 	}
 }

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/toptabs/TopTabController.java

@@ -5,21 +5,21 @@ import android.view.View;
 
 import com.reactnativenavigation.parse.NavigationOptions;
 import com.reactnativenavigation.presentation.NavigationOptionsListener;
-import com.reactnativenavigation.viewcontrollers.ContainerViewController;
+import com.reactnativenavigation.viewcontrollers.ComponentViewController;
 import com.reactnativenavigation.viewcontrollers.ViewController;
 import com.reactnativenavigation.views.TopTab;
 
 public class TopTabController extends ViewController implements NavigationOptionsListener {
 
-    private final String containerName;
-    private ContainerViewController.ReactViewCreator viewCreator;
+    private final String componentName;
+    private ComponentViewController.ReactViewCreator viewCreator;
     private final NavigationOptions options;
     private TopTab topTab;
     private boolean isSelectedTab;
 
-    public TopTabController(Activity activity, String id, String name, ContainerViewController.ReactViewCreator viewCreator, NavigationOptions initialOptions) {
+    public TopTabController(Activity activity, String id, String name, ComponentViewController.ReactViewCreator viewCreator, NavigationOptions initialOptions) {
         super(activity, id);
-        this.containerName = name;
+        this.componentName = name;
         this.viewCreator = viewCreator;
         this.options = initialOptions;
     }
@@ -29,7 +29,7 @@ public class TopTabController extends ViewController implements NavigationOption
         super.onViewAppeared();
         isSelectedTab = true;
         applyOptions(options);
-        topTab.sendContainerStart();
+        topTab.sendComponentStart();
     }
 
     @Override
@@ -41,7 +41,7 @@ public class TopTabController extends ViewController implements NavigationOption
     public void onViewDisappear() {
         super.onViewDisappear();
         isSelectedTab = false;
-        topTab.sendContainerStop();
+        topTab.sendComponentStop();
     }
 
     @Override
@@ -53,7 +53,7 @@ public class TopTabController extends ViewController implements NavigationOption
     public View createView() {
         topTab = new TopTab(
                 getActivity(),
-                viewCreator.create(getActivity(), getId(), containerName)
+                viewCreator.create(getActivity(), getId(), componentName)
         );
         return topTab;
     }

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/toptabs/TopTabsAdapter.java

@@ -31,7 +31,7 @@ public class TopTabsAdapter extends PagerAdapter implements ViewPager.OnPageChan
     }
 
     @Override
-    public Object instantiateItem(ViewGroup container, int position) {
+    public Object instantiateItem(ViewGroup component, int position) {
         return tabs.get(position).getView();
     }
 

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/toptabs/TopTabsViewPager.java

@@ -5,7 +5,7 @@ import android.content.Context;
 import android.support.v4.view.ViewPager;
 import android.view.ViewGroup;
 
-import com.reactnativenavigation.viewcontrollers.ContainerViewController;
+import com.reactnativenavigation.viewcontrollers.ComponentViewController;
 import com.reactnativenavigation.viewcontrollers.ViewController;
 
 import java.util.List;
@@ -39,6 +39,6 @@ public class TopTabsViewPager extends ViewPager {
     }
 
     public void sendOnNavigationButtonPressed(String id) {
-        ((ContainerViewController.IReactView) tabs.get(getCurrentItem()).getView()).sendOnNavigationButtonPressed(id);
+        ((ComponentViewController.IReactView) tabs.get(getCurrentItem()).getView()).sendOnNavigationButtonPressed(id);
     }
-}
+}

lib/android/app/src/main/java/com/reactnativenavigation/views/Container.java → lib/android/app/src/main/java/com/reactnativenavigation/views/Component.java

@@ -4,7 +4,7 @@ import android.support.annotation.RestrictTo;
 
 import com.reactnativenavigation.parse.NavigationOptions;
 
-public interface Container {
+public interface Component {
     void applyOptions(NavigationOptions options);
 
     void sendOnNavigationButtonPressed(String id);

lib/android/app/src/main/java/com/reactnativenavigation/views/ContainerLayout.java → lib/android/app/src/main/java/com/reactnativenavigation/views/ComponentLayout.java

@@ -8,16 +8,16 @@ import android.widget.LinearLayout;
 
 import com.reactnativenavigation.parse.NavigationOptions;
 import com.reactnativenavigation.presentation.OptionsPresenter;
-import com.reactnativenavigation.viewcontrollers.ContainerViewController.IReactView;
+import com.reactnativenavigation.viewcontrollers.ComponentViewController.IReactView;
 
 @SuppressLint("ViewConstructor")
-public class ContainerLayout extends LinearLayout implements ReactContainer {
+public class ComponentLayout extends LinearLayout implements ReactComponent {
 
 	private TopBar topBar;
 	private IReactView reactView;
 	private final OptionsPresenter optionsPresenter;
 
-	public ContainerLayout(Context context, IReactView reactView) {
+	public ComponentLayout(Context context, IReactView reactView) {
 		super(context);
 		this.topBar = new TopBar(context, this);
 		this.reactView = reactView;
@@ -47,13 +47,13 @@ public class ContainerLayout extends LinearLayout implements ReactContainer {
 	}
 
 	@Override
-	public void sendContainerStart() {
-		reactView.sendContainerStart();
+	public void sendComponentStart() {
+		reactView.sendComponentStart();
 	}
 
 	@Override
-	public void sendContainerStop() {
-		reactView.sendContainerStop();
+	public void sendComponentStop() {
+		reactView.sendComponentStop();
 	}
 
     @Override

lib/android/app/src/main/java/com/reactnativenavigation/views/ComponentViewCreator.java

@@ -0,0 +1,22 @@
+package com.reactnativenavigation.views;
+
+import android.app.Activity;
+
+import com.facebook.react.ReactInstanceManager;
+import com.reactnativenavigation.react.ReactComponentViewCreator;
+import com.reactnativenavigation.viewcontrollers.ComponentViewController;
+
+public class ComponentViewCreator implements ComponentViewController.ReactViewCreator {
+
+    private ReactInstanceManager instanceManager;
+
+    public ComponentViewCreator(ReactInstanceManager instanceManager) {
+        this.instanceManager = instanceManager;
+	}
+
+	@Override
+	public ComponentViewController.IReactView create(Activity activity, String componentId, String componentName) {
+        ComponentViewController.IReactView reactView = new ReactComponentViewCreator(instanceManager).create(activity, componentId, componentName);
+        return new ComponentLayout(activity, reactView);
+	}
+}

lib/android/app/src/main/java/com/reactnativenavigation/views/ContainerViewCreator.java

@@ -1,22 +0,0 @@
-package com.reactnativenavigation.views;
-
-import android.app.Activity;
-
-import com.facebook.react.ReactInstanceManager;
-import com.reactnativenavigation.react.ReactContainerViewCreator;
-import com.reactnativenavigation.viewcontrollers.ContainerViewController;
-
-public class ContainerViewCreator implements ContainerViewController.ReactViewCreator {
-
-    private ReactInstanceManager instanceManager;
-
-    public ContainerViewCreator(ReactInstanceManager instanceManager) {
-        this.instanceManager = instanceManager;
-	}
-
-	@Override
-	public ContainerViewController.IReactView create(Activity activity, String containerId, String containerName) {
-        ContainerViewController.IReactView reactView = new ReactContainerViewCreator(instanceManager).create(activity, containerId, containerName);
-        return new ContainerLayout(activity, reactView);
-	}
-}

lib/android/app/src/main/java/com/reactnativenavigation/views/CustomDialog.java

@@ -14,16 +14,16 @@ import com.facebook.react.ReactRootView;
 
 public class CustomDialog extends Dialog {
 
-	private View container;
+	private View component;
 
-	public CustomDialog(@NonNull Context context, @NonNull View container) {
+	public CustomDialog(@NonNull Context context, @NonNull View component) {
 		super(context);
 
-		this.container = container;
+		this.component = component;
 		init();
 	}
 
 	private void init() {
-		addContentView(container, new WindowManager.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+		addContentView(component, new WindowManager.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
 	}
 }

lib/android/app/src/main/java/com/reactnativenavigation/views/ReactComponent.java

@@ -0,0 +1,6 @@
+package com.reactnativenavigation.views;
+
+import com.reactnativenavigation.viewcontrollers.ComponentViewController;
+
+public interface ReactComponent extends Component, ComponentViewController.IReactView {
+}

lib/android/app/src/main/java/com/reactnativenavigation/views/ReactContainer.java

@@ -1,6 +0,0 @@
-package com.reactnativenavigation.views;
-
-import com.reactnativenavigation.viewcontrollers.ContainerViewController;
-
-public interface ReactContainer extends Container, ContainerViewController.IReactView {
-}

lib/android/app/src/main/java/com/reactnativenavigation/views/TitleBarButton.java

@@ -24,11 +24,11 @@ import java.util.ArrayList;
 public class TitleBarButton implements MenuItem.OnMenuItemClickListener {
 	private Toolbar toolbar;
 	private final Button button;
-	private Container container;
+	private Component component;
 	private Drawable icon;
 
-	TitleBarButton(Container container, Toolbar toolbar, Button button) {
-		this.container = container;
+	TitleBarButton(Component component, Toolbar toolbar, Button button) {
+		this.component = component;
 		this.toolbar = toolbar;
 		this.button = button;
 	}
@@ -118,12 +118,12 @@ public class TitleBarButton implements MenuItem.OnMenuItemClickListener {
 	}
 
 	private void setNavigationClickListener() {
-		toolbar.setNavigationOnClickListener(view -> container.sendOnNavigationButtonPressed(button.id));
+		toolbar.setNavigationOnClickListener(view -> component.sendOnNavigationButtonPressed(button.id));
 	}
 
 	@Override
 	public boolean onMenuItemClick(MenuItem menuItem) {
-		this.container.sendOnNavigationButtonPressed(button.id);
+		this.component.sendOnNavigationButtonPressed(button.id);
 		return true;
 	}
 

lib/android/app/src/main/java/com/reactnativenavigation/views/TopBar.java

@@ -23,12 +23,12 @@ import java.util.ArrayList;
 @SuppressLint("ViewConstructor")
 public class TopBar extends AppBarLayout {
 	private final Toolbar titleBar;
-    private Container container;
+    private Component component;
     private TopTabs topTabs;
 
-    public TopBar(final Context context, Container container) {
+    public TopBar(final Context context, Component component) {
         super(context);
-        this.container = container;
+        this.component = component;
         titleBar = new Toolbar(context);
         topTabs = new TopTabs(getContext());
         addView(titleBar);
@@ -115,7 +115,7 @@ public class TopBar extends AppBarLayout {
 	}
 
 	private void setLeftButton(final Button button) {
-		TitleBarButton leftBarButton = new TitleBarButton(container, this.titleBar, button);
+		TitleBarButton leftBarButton = new TitleBarButton(component, this.titleBar, button);
 		leftBarButton.applyNavigationIcon(getContext());
 	}
 
@@ -129,7 +129,7 @@ public class TopBar extends AppBarLayout {
 
 		for (int i = 0; i < rightButtons.size(); i++){
 	   		Button button = rightButtons.get(i);
-			TitleBarButton titleBarButton = new TitleBarButton(container, this.titleBar, button);
+			TitleBarButton titleBarButton = new TitleBarButton(component, this.titleBar, button);
 			titleBarButton.addToMenu(getContext(), menu);
        }
     }

lib/android/app/src/main/java/com/reactnativenavigation/views/TopTab.java

@@ -5,7 +5,7 @@ import android.content.Context;
 import android.view.View;
 import android.widget.FrameLayout;
 
-import com.reactnativenavigation.viewcontrollers.ContainerViewController.IReactView;
+import com.reactnativenavigation.viewcontrollers.ComponentViewController.IReactView;
 
 @SuppressLint("ViewConstructor")
 public class TopTab extends FrameLayout implements IReactView {
@@ -34,13 +34,13 @@ public class TopTab extends FrameLayout implements IReactView {
 	}
 
 	@Override
-	public void sendContainerStart() {
-		reactView.sendContainerStart();
+	public void sendComponentStart() {
+		reactView.sendComponentStart();
 	}
 
 	@Override
-	public void sendContainerStop() {
-		reactView.sendContainerStop();
+	public void sendComponentStop() {
+		reactView.sendComponentStop();
 	}
 
     @Override

lib/android/app/src/main/java/com/reactnativenavigation/views/TopTabCreator.java

@@ -3,10 +3,10 @@ package com.reactnativenavigation.views;
 import android.app.Activity;
 
 import com.facebook.react.ReactInstanceManager;
-import com.reactnativenavigation.react.ReactContainerViewCreator;
-import com.reactnativenavigation.viewcontrollers.ContainerViewController;
+import com.reactnativenavigation.react.ReactComponentViewCreator;
+import com.reactnativenavigation.viewcontrollers.ComponentViewController;
 
-public class TopTabCreator implements ContainerViewController.ReactViewCreator {
+public class TopTabCreator implements ComponentViewController.ReactViewCreator {
 
 
     private ReactInstanceManager instanceManager;
@@ -16,8 +16,8 @@ public class TopTabCreator implements ContainerViewController.ReactViewCreator {
     }
 
 	@Override
-	public ContainerViewController.IReactView create(Activity activity, String containerId, String containerName) {
-        ContainerViewController.IReactView reactView = new ReactContainerViewCreator(instanceManager).create(activity, containerId, containerName);
+	public ComponentViewController.IReactView create(Activity activity, String componentId, String componentName) {
+        ComponentViewController.IReactView reactView = new ReactComponentViewCreator(instanceManager).create(activity, componentId, componentName);
         return new TopTab(activity, reactView);
 	}
 }

lib/android/app/src/main/java/com/reactnativenavigation/views/TopTabsLayout.java

@@ -15,7 +15,7 @@ import com.reactnativenavigation.viewcontrollers.toptabs.TopTabsViewPager;
 import java.util.List;
 
 @SuppressLint("ViewConstructor")
-public class TopTabsLayout extends LinearLayout implements Container {
+public class TopTabsLayout extends LinearLayout implements Component {
 
     private TopBar topBar;
     private TopTabsViewPager viewPager;

lib/android/app/src/test/java/com/reactnativenavigation/mocks/SimpleComponentViewController.java

@@ -0,0 +1,12 @@
+package com.reactnativenavigation.mocks;
+
+import android.app.Activity;
+
+import com.reactnativenavigation.parse.NavigationOptions;
+import com.reactnativenavigation.viewcontrollers.ComponentViewController;
+
+public class SimpleComponentViewController extends ComponentViewController {
+	public SimpleComponentViewController(final Activity activity, final String id) {
+		super(activity, id, "theComponentName", new TestComponentViewCreator(), new NavigationOptions());
+	}
+}

lib/android/app/src/test/java/com/reactnativenavigation/mocks/SimpleContainerViewController.java

@@ -1,12 +0,0 @@
-package com.reactnativenavigation.mocks;
-
-import android.app.Activity;
-
-import com.reactnativenavigation.parse.NavigationOptions;
-import com.reactnativenavigation.viewcontrollers.ContainerViewController;
-
-public class SimpleContainerViewController extends ContainerViewController {
-	public SimpleContainerViewController(final Activity activity, final String id) {
-		super(activity, id, "theContainerName", new TestContainerViewCreator(), new NavigationOptions());
-	}
-}

lib/android/app/src/test/java/com/reactnativenavigation/mocks/TestContainerLayout.java → lib/android/app/src/test/java/com/reactnativenavigation/mocks/TestComponentLayout.java

@@ -5,15 +5,15 @@ import android.view.View;
 
 import com.reactnativenavigation.parse.NavigationOptions;
 import com.reactnativenavigation.presentation.OptionsPresenter;
-import com.reactnativenavigation.views.ReactContainer;
+import com.reactnativenavigation.views.ReactComponent;
 import com.reactnativenavigation.views.TopBar;
 
-public class TestContainerLayout extends View implements ReactContainer {
+public class TestComponentLayout extends View implements ReactComponent {
 
     private final TopBar topBar;
     private final OptionsPresenter optionsPresenter;
 
-    public TestContainerLayout(final Context context) {
+    public TestComponentLayout(final Context context) {
 		super(context);
         topBar = new TopBar(context, this);
         optionsPresenter = new OptionsPresenter(topBar, new View(context));
@@ -38,11 +38,11 @@ public class TestContainerLayout extends View implements ReactContainer {
 	}
 
 	@Override
-	public void sendContainerStart() {
+	public void sendComponentStart() {
 	}
 
 	@Override
-	public void sendContainerStop() {
+	public void sendComponentStop() {
 	}
 
     @Override

lib/android/app/src/test/java/com/reactnativenavigation/mocks/TestContainerView.java → lib/android/app/src/test/java/com/reactnativenavigation/mocks/TestComponentView.java

@@ -4,14 +4,14 @@ import android.content.Context;
 import android.view.View;
 
 import com.reactnativenavigation.parse.NavigationOptions;
-import com.reactnativenavigation.views.ReactContainer;
+import com.reactnativenavigation.views.ReactComponent;
 import com.reactnativenavigation.views.TopBar;
 
-public class TestContainerView extends View implements ReactContainer {
+public class TestComponentView extends View implements ReactComponent {
 
 	private TopBar topBar;
 
-	public TestContainerView(final Context context) {
+	public TestComponentView(final Context context) {
 		super(context);
 		topBar = new TopBar(context, this);
 
@@ -32,11 +32,11 @@ public class TestContainerView extends View implements ReactContainer {
 	}
 
 	@Override
-	public void sendContainerStart() {
+	public void sendComponentStart() {
 	}
 
 	@Override
-	public void sendContainerStop() {
+	public void sendComponentStop() {
 	}
 
     @Override

lib/android/app/src/test/java/com/reactnativenavigation/mocks/TestComponentViewCreator.java

@@ -0,0 +1,13 @@
+package com.reactnativenavigation.mocks;
+
+import android.app.Activity;
+
+import com.reactnativenavigation.viewcontrollers.ComponentViewController;
+import com.reactnativenavigation.viewcontrollers.ComponentViewController.ReactViewCreator;
+
+public class TestComponentViewCreator implements ReactViewCreator {
+	@Override
+	public ComponentViewController.IReactView create(final Activity activity, final String componentId, final String componentName) {
+		return new TestComponentLayout(activity);
+	}
+}

lib/android/app/src/test/java/com/reactnativenavigation/mocks/TestContainerViewCreator.java

@@ -1,13 +0,0 @@
-package com.reactnativenavigation.mocks;
-
-import android.app.Activity;
-
-import com.reactnativenavigation.viewcontrollers.ContainerViewController;
-import com.reactnativenavigation.viewcontrollers.ContainerViewController.ReactViewCreator;
-
-public class TestContainerViewCreator implements ReactViewCreator {
-	@Override
-	public ContainerViewController.IReactView create(final Activity activity, final String containerId, final String containerName) {
-		return new TestContainerLayout(activity);
-	}
-}

lib/android/app/src/test/java/com/reactnativenavigation/mocks/TopTabLayoutMock.java

@@ -3,9 +3,9 @@ package com.reactnativenavigation.mocks;
 import android.content.Context;
 import android.view.View;
 
-import com.reactnativenavigation.viewcontrollers.ContainerViewController;
+import com.reactnativenavigation.viewcontrollers.ComponentViewController;
 
-public class TopTabLayoutMock extends View implements ContainerViewController.IReactView {
+public class TopTabLayoutMock extends View implements ComponentViewController.IReactView {
 
     public TopTabLayoutMock(Context context) {
         super(context);
@@ -27,12 +27,12 @@ public class TopTabLayoutMock extends View implements ContainerViewController.IR
     }
 
     @Override
-    public void sendContainerStart() {
+    public void sendComponentStart() {
 
     }
 
     @Override
-    public void sendContainerStop() {
+    public void sendComponentStop() {
 
     }
 

lib/android/app/src/test/java/com/reactnativenavigation/parse/LayoutNodeParserTest.java

@@ -10,16 +10,16 @@ import static org.assertj.core.api.Java6Assertions.assertThat;
 public class LayoutNodeParserTest extends BaseTest {
 	@Test
 	public void dto() throws Exception {
-		LayoutNode node = new LayoutNode("the id", LayoutNode.Type.Container);
+		LayoutNode node = new LayoutNode("the id", LayoutNode.Type.Component);
 		assertThat(node.id).isEqualTo("the id");
-		assertThat(node.type).isEqualTo(LayoutNode.Type.Container);
+		assertThat(node.type).isEqualTo(LayoutNode.Type.Component);
 		assertThat(node.data.keys()).isEmpty();
 		assertThat(node.children).isEmpty();
 	}
 
 	@Test
 	public void parseType() throws Exception {
-		assertThat(LayoutNode.Type.valueOf("Container")).isEqualTo(LayoutNode.Type.Container);
+		assertThat(LayoutNode.Type.valueOf("Component")).isEqualTo(LayoutNode.Type.Component);
 	}
 
 	@Test(expected = RuntimeException.class)
@@ -30,20 +30,20 @@ public class LayoutNodeParserTest extends BaseTest {
 	@Test
 	public void parseFromTree() throws Exception {
 		JSONObject tree = new JSONObject("{id: node1, " +
-				"type: ContainerStack, " +
+				"type: ComponentStack, " +
 				"data: {dataKey: dataValue}, " +
-				"children: [{id: childId1, type: Container}]}");
+				"children: [{id: childId1, type: Component}]}");
 
 		LayoutNode result = LayoutNodeParser.parse(tree);
 
 		assertThat(result).isNotNull();
 		assertThat(result.id).isEqualTo("node1");
-		assertThat(result.type).isEqualTo(LayoutNode.Type.ContainerStack);
+		assertThat(result.type).isEqualTo(LayoutNode.Type.ComponentStack);
 		assertThat(result.data.length()).isEqualTo(1);
 		assertThat(result.data.getString("dataKey")).isEqualTo("dataValue");
 		assertThat(result.children).hasSize(1);
 		assertThat(result.children.get(0).id).isEqualTo("childId1");
-		assertThat(result.children.get(0).type).isEqualTo(LayoutNode.Type.Container);
+		assertThat(result.children.get(0).type).isEqualTo(LayoutNode.Type.Component);
 		assertThat(result.children.get(0).data.keys()).isEmpty();
 		assertThat(result.children.get(0).children).isEmpty();
 	}

lib/android/app/src/test/java/com/reactnativenavigation/parse/NavigationOptionsTest.java

@@ -27,7 +27,7 @@ public class NavigationOptionsTest extends BaseTest {
     private static final NavigationOptions.BooleanOptions BOTTOM_TABS_ANIMATE_HIDE = True;
     private static final NavigationOptions.BooleanOptions BOTTOM_TABS_HIDDEN = True;
     private static final int BOTTOM_TABS_BADGE = 3;
-    private static final String BOTTOM_TABS_CURRENT_TAB_ID = "ContainerId";
+    private static final String BOTTOM_TABS_CURRENT_TAB_ID = "ComponentId";
     private static final int BOTTOM_TABS_CURRENT_TAB_INDEX = 1;
     private TypefaceLoader mockLoader;
 

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/ContainerViewControllerTest.java → lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/ComponentViewControllerTest.java

@@ -3,7 +3,7 @@ package com.reactnativenavigation.viewcontrollers;
 import android.app.Activity;
 
 import com.reactnativenavigation.BaseTest;
-import com.reactnativenavigation.mocks.TestContainerLayout;
+import com.reactnativenavigation.mocks.TestComponentLayout;
 import com.reactnativenavigation.parse.NavigationOptions;
 
 import org.junit.Test;
@@ -14,30 +14,30 @@ import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-public class ContainerViewControllerTest extends BaseTest {
-	private ContainerViewController uut;
-	private ContainerViewController.IReactView view;
+public class ComponentViewControllerTest extends BaseTest {
+	private ComponentViewController uut;
+	private ComponentViewController.IReactView view;
 
 	@Override
 	public void beforeEach() {
 		super.beforeEach();
 		Activity activity = newActivity();
-		view = spy(new TestContainerLayout(activity));
-		uut = new ContainerViewController(activity, "containerId1", "containerName", new ContainerViewController.ReactViewCreator() {
+		view = spy(new TestComponentLayout(activity));
+		uut = new ComponentViewController(activity, "componentId1", "componentName", new ComponentViewController.ReactViewCreator() {
 			@Override
-			public ContainerViewController.IReactView create(final Activity activity1, final String containerId, final String containerName) {
+			public ComponentViewController.IReactView create(final Activity activity1, final String componentId, final String componentName) {
 				return view;
 			}
 		}, new NavigationOptions());
 	}
 
 	@Test
-	public void createsViewFromContainerViewCreator() throws Exception {
+	public void createsViewFromComponentViewCreator() throws Exception {
 		assertThat(uut.getView()).isSameAs(view);
 	}
 
 	@Test
-	public void containerViewDestroyedOnDestroy() throws Exception {
+	public void componentViewDestroyedOnDestroy() throws Exception {
 		uut.ensureViewIsCreated();
 		verify(view, times(0)).destroy();
 		uut.destroy();
@@ -45,20 +45,20 @@ public class ContainerViewControllerTest extends BaseTest {
 	}
 
 	@Test
-	public void lifecycleMethodsSentToContainerView() throws Exception {
+	public void lifecycleMethodsSentToComponentView() throws Exception {
 		uut.ensureViewIsCreated();
-		verify(view, times(0)).sendContainerStart();
-		verify(view, times(0)).sendContainerStop();
+		verify(view, times(0)).sendComponentStart();
+		verify(view, times(0)).sendComponentStop();
 		uut.onViewAppeared();
-		verify(view, times(1)).sendContainerStart();
-		verify(view, times(0)).sendContainerStop();
+		verify(view, times(1)).sendComponentStart();
+		verify(view, times(0)).sendComponentStop();
 		uut.onViewDisappear();
-		verify(view, times(1)).sendContainerStart();
-		verify(view, times(1)).sendContainerStop();
+		verify(view, times(1)).sendComponentStart();
+		verify(view, times(1)).sendComponentStop();
 	}
 
 	@Test
-	public void isViewShownOnlyIfContainerViewIsReady() throws Exception {
+	public void isViewShownOnlyIfComponentViewIsReady() throws Exception {
 		assertThat(uut.isViewShown()).isFalse();
 		uut.ensureViewIsCreated();
 		when(view.asView().isShown()).thenReturn(true);

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/NavigatorTest.java

@@ -5,7 +5,7 @@ import android.support.annotation.NonNull;
 
 import com.reactnativenavigation.BaseTest;
 import com.reactnativenavigation.mocks.MockPromise;
-import com.reactnativenavigation.mocks.SimpleContainerViewController;
+import com.reactnativenavigation.mocks.SimpleComponentViewController;
 import com.reactnativenavigation.mocks.SimpleViewController;
 import com.reactnativenavigation.mocks.TestStackAnimator;
 import com.reactnativenavigation.parse.NavigationOptions;
@@ -195,19 +195,19 @@ public class NavigatorTest extends BaseTest {
 
 	@Test
 	public void setOptions_CallsApplyNavigationOptions() {
-		ContainerViewController containerVc = new SimpleContainerViewController(activity, "theId");
-		uut.setRoot(containerVc);
-		assertThat(containerVc.getNavigationOptions().topBarOptions.title).isEmpty();
+		ComponentViewController componentVc = new SimpleComponentViewController(activity, "theId");
+		uut.setRoot(componentVc);
+		assertThat(componentVc.getNavigationOptions().topBarOptions.title).isEmpty();
 
 		NavigationOptions options = new NavigationOptions();
 		options.topBarOptions.title = "new title";
 
 		uut.setOptions("theId", options);
-		assertThat(containerVc.getNavigationOptions().topBarOptions.title).isEqualTo("new title");
+		assertThat(componentVc.getNavigationOptions().topBarOptions.title).isEqualTo("new title");
 	}
 
 	@Test
-	public void setOptions_AffectsOnlyContainerViewControllers() {
+	public void setOptions_AffectsOnlyComponentViewControllers() {
 		uut.setOptions("some unknown child id", new NavigationOptions());
 	}
 

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/OptionsApplyingTest.java

@@ -6,7 +6,7 @@ import android.graphics.drawable.ColorDrawable;
 import android.view.View;
 
 import com.reactnativenavigation.BaseTest;
-import com.reactnativenavigation.mocks.TestContainerLayout;
+import com.reactnativenavigation.mocks.TestComponentLayout;
 import com.reactnativenavigation.parse.NavigationOptions;
 
 import org.junit.Test;
@@ -16,8 +16,8 @@ import static org.mockito.Mockito.spy;
 
 public class OptionsApplyingTest extends BaseTest {
 	private Activity activity;
-	private ContainerViewController uut;
-	private ContainerViewController.IReactView view;
+	private ComponentViewController uut;
+	private ComponentViewController.IReactView view;
 	private NavigationOptions initialNavigationOptions;
 
 	@Override
@@ -25,11 +25,11 @@ public class OptionsApplyingTest extends BaseTest {
 		super.beforeEach();
 		activity = newActivity();
 		initialNavigationOptions = new NavigationOptions();
-		view = spy(new TestContainerLayout(activity));
-		uut = new ContainerViewController(activity,
-                "containerId1",
-                "containerName",
-                (activity1, containerId, containerName) -> view,
+		view = spy(new TestComponentLayout(activity));
+		uut = new ComponentViewController(activity,
+                "componentId1",
+                "componentName",
+                (activity1, componentId, componentName) -> view,
                 initialNavigationOptions
         );
 		uut.ensureViewIsCreated();
@@ -134,4 +134,4 @@ public class OptionsApplyingTest extends BaseTest {
 
 		assertThat(uut.getTopBar().getVisibility()).isEqualTo(View.GONE);
 	}
-}
+}

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/TopTabControllerTest.java

@@ -26,12 +26,12 @@ public class TopTabControllerTest extends BaseTest {
         view = spy(new TopTabLayoutMock(activity));
         initialOptions = new NavigationOptions();
         uut = new TopTabController(activity,
-                "containerId",
-                "containerName",
-                (activity1, containerId, containerName) -> view,
+                "componentId",
+                "componentName",
+                (activity1, componentId, componentName) -> view,
                 initialOptions
         );
-        parentController = spy(new TopTabsControllerMock(activity, "parentContainerId"));
+        parentController = spy(new TopTabsControllerMock(activity, "parentComponentId"));
         uut.setParentController(parentController);
     }
 

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/TopTabsViewControllerTest.java

@@ -6,7 +6,7 @@ import android.view.ViewGroup;
 import com.reactnativenavigation.BaseTest;
 import com.reactnativenavigation.mocks.TopTabLayoutMock;
 import com.reactnativenavigation.parse.NavigationOptions;
-import com.reactnativenavigation.viewcontrollers.ContainerViewController.IReactView;
+import com.reactnativenavigation.viewcontrollers.ComponentViewController.IReactView;
 import com.reactnativenavigation.viewcontrollers.toptabs.TopTabController;
 import com.reactnativenavigation.viewcontrollers.toptabs.TopTabsAdapter;
 import com.reactnativenavigation.viewcontrollers.toptabs.TopTabsController;
@@ -46,7 +46,7 @@ public class TopTabsViewControllerTest extends BaseTest {
 
         TopTabsLayoutCreator layoutCreator = Mockito.mock(TopTabsLayoutCreator.class);
         Mockito.when(layoutCreator.create()).thenReturn(topTabsLayout);
-        uut = new TopTabsController(activity, "containerId", tabControllers, layoutCreator, navigationOptions);
+        uut = new TopTabsController(activity, "componentId", tabControllers, layoutCreator, navigationOptions);
     }
 
     private void createTabs(Activity activity) {
@@ -57,14 +57,14 @@ public class TopTabsViewControllerTest extends BaseTest {
             tabControllers.add(spy(new TopTabController(activity,
                     "idTab" + i,
                     "tab" + i,
-                    (activity1, containerId, containerName) -> reactView,
+                    (activity1, componentId, componentName) -> reactView,
                     tabOptions.get(i))
             ));
         }
     }
 
     @Test
-    public void createsViewFromContainerViewCreator() throws Exception {
+    public void createsViewFromComponentViewCreator() throws Exception {
         uut.ensureViewIsCreated();
         for (int i = 0; i < SIZE; i++) {
             verify(tabControllers.get(i), times(1)).createView();
@@ -72,7 +72,7 @@ public class TopTabsViewControllerTest extends BaseTest {
     }
 
     @Test
-    public void containerViewDestroyedOnDestroy() throws Exception {
+    public void componentViewDestroyedOnDestroy() throws Exception {
         uut.ensureViewIsCreated();
         TopTabsLayout topTabs = (TopTabsLayout) uut.getView();
         for (int i = 0; i < SIZE; i++) {
@@ -91,9 +91,9 @@ public class TopTabsViewControllerTest extends BaseTest {
         TopTabLayoutMock selectedTab = tabs.get(1);
         uut.onViewAppeared();
         uut.switchToTab(1);
-        verify(initialTab, times(1)).sendContainerStop();
-        verify(selectedTab, times(1)).sendContainerStart();
-        verify(selectedTab, times(0)).sendContainerStop();
+        verify(initialTab, times(1)).sendComponentStop();
+        verify(selectedTab, times(1)).sendComponentStart();
+        verify(selectedTab, times(0)).sendComponentStop();
     }
 
     @Test
@@ -102,10 +102,10 @@ public class TopTabsViewControllerTest extends BaseTest {
         uut.onViewAppeared();
         uut.switchToTab(1);
         uut.switchToTab(0);
-        verify(tabs.get(0), times(1)).sendContainerStop();
-        verify(tabs.get(0), times(2)).sendContainerStart();
-        verify(tabs.get(1), times(1)).sendContainerStart();
-        verify(tabs.get(1), times(1)).sendContainerStop();
+        verify(tabs.get(0), times(1)).sendComponentStop();
+        verify(tabs.get(0), times(2)).sendComponentStart();
+        verify(tabs.get(1), times(1)).sendComponentStart();
+        verify(tabs.get(1), times(1)).sendComponentStop();
     }
 
     @Test