keep renaming

e2e/ScreenStyle.test.js

     await device.relaunchApp();
   });
 
-  it('declare a options on container component', async () => {
+  it('declare a options on component component', async () => {
     await elementById(testIDs.PUSH_OPTIONS_BUTTON).tap();
     await expect(element(by.label('Static Title'))).toBeVisible();
   });
 
-  it('change title on container component', async () => {
+  it('change title on component component', async () => {
     await elementById(testIDs.PUSH_OPTIONS_BUTTON).tap();
     await expect(element(by.label('Static Title'))).toBeVisible();
     await elementById(testIDs.DYNAMIC_OPTIONS_BUTTON).tap();

lib/src/Navigation.js

   /**
    * Push a new screen into this screen's navigation stack.
    * @param {string} componentId The component's id.
-   * @param {Container} component
+   * @param {Component} component
    */
   push(componentId, component) {
     return this.commands.push(componentId, component);

playground/src/containers/CustomTransitionOrigin.js

     );
   }
   onClickNavigationIcon() {
-    Navigation.push(this.props.containerId, {
+    Navigation.push(this.props.componentId, {
       component: {
         name: 'navigation.playground.CustomTransitionDestination',
         customTransition: {

playground/src/containers/ModalScreen.js

         {this.getPreviousModalId() ? (<Button title="Dismiss Previous Modal" testID={testIDs.DISMISS_PREVIOUS_MODAL_BUTTON} onPress={this.onClickDismissPreviousModal} />) : undefined}
         {this.props.previousModalIds ? (<Button title="Dismiss ALL Previous Modals" testID={testIDs.DISMISS_ALL_PREVIOUS_MODAL_BUTTON} onPress={this.onClickDismissAllPreviousModals} />) : undefined}
         {this.props.previousModalIds ? (<Button title="Dismiss First In Stack" testID={testIDs.DISMISS_FIRST_MODAL_BUTTON} onPress={this.onClickDismissFirstInStack} />) : undefined}
-        <Text style={styles.footer}>{`this.props.containerId = ${this.props.containerId}`}</Text>
+        <Text style={styles.footer}>{`this.props.componentId = ${this.props.componentId}`}</Text>
       </View>
     );
   }
         name: 'navigation.playground.ModalScreen',
         passProps: {
           modalPosition: this.getModalPosition() + 1,
-          previousModalIds: _.concat([], this.props.previousModalIds || [], this.props.containerId)
+          previousModalIds: _.concat([], this.props.previousModalIds || [], this.props.componentId)
         }
       }
     });
   }
 
   async onClickDismissModal() {
-    await Navigation.dismissModal(this.props.containerId);
+    await Navigation.dismissModal(this.props.componentId);
   }
 
   onClickDismissPreviousModal() {