Fix naming and variable types

android/app/src/main/java/com/reactnativenavigation/layouts/ScreenLayout.java

@@ -11,12 +11,12 @@ import android.view.Window;
 import android.widget.LinearLayout;
 
 import com.facebook.react.ReactInstanceManager;
-import com.reactnativenavigation.controllers.ScreenParams;
+import com.reactnativenavigation.params.ScreenParams;
 import com.reactnativenavigation.params.ScreenStyleParams;
+import com.reactnativenavigation.params.TitleBarButtonParams;
 import com.reactnativenavigation.utils.SdkSupports;
 import com.reactnativenavigation.views.ContentView;
 import com.reactnativenavigation.views.ScrollDirectionListener;
-import com.reactnativenavigation.views.TitleBarButton;
 
 import java.util.List;
 
@@ -26,16 +26,16 @@ import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
 public class ScreenLayout extends LinearLayout implements ScrollDirectionListener.OnScrollChanged {
 
     private final ReactInstanceManager reactInstanceManager;
-    private final String moduleName;
+    private final String screenId;
     private final Bundle passProps;
-    private final List<TitleBarButton.Params> buttons;
+    private final List<TitleBarButtonParams> buttons;
     private ContentView contentView;
     private TopBar topBar;
 
     public ScreenLayout(Context context, ReactInstanceManager reactInstanceManager, ScreenParams screenParams) {
         super(context);
         this.reactInstanceManager = reactInstanceManager;
-        moduleName = screenParams.moduleName;
+        screenId = screenParams.screenId;
         passProps = screenParams.passProps;
         buttons = screenParams.buttons;
         setOrientation(VERTICAL);
@@ -56,7 +56,7 @@ public class ScreenLayout extends LinearLayout implements ScrollDirectionListene
     }
 
     private void addContentView() {
-        contentView = new ContentView(getContext(), reactInstanceManager, moduleName, passProps, this);
+        contentView = new ContentView(getContext(), reactInstanceManager, screenId, passProps, this);
         addView(contentView, new LayoutParams(MATCH_PARENT, MATCH_PARENT));
     }
 

android/app/src/main/java/com/reactnativenavigation/layouts/TopBar.java

@@ -3,8 +3,8 @@ package com.reactnativenavigation.layouts;
 import android.content.Context;
 import android.support.design.widget.AppBarLayout;
 
+import com.reactnativenavigation.params.TitleBarButtonParams;
 import com.reactnativenavigation.views.TitleBar;
-import com.reactnativenavigation.views.TitleBarButton;
 
 import java.util.List;
 
@@ -17,7 +17,7 @@ public class TopBar extends AppBarLayout {
         setFitsSystemWindows(true);
     }
 
-    public void addTitleBarAndSetButtons(List<TitleBarButton.Params> buttons) {
+    public void addTitleBarAndSetButtons(List<TitleBarButtonParams> buttons) {
         titleBar = new TitleBar(getContext());
         titleBar.setButtons(buttons);
     }

android/app/src/main/java/com/reactnativenavigation/views/ContentView.java

@@ -11,20 +11,20 @@ import com.reactnativenavigation.react.ReactViewHacks;
 public class ContentView extends ReactRootView {
 
     private final ReactInstanceManager reactInstanceManager;
-    private final String moduleName;
+    private final String screenId;
     private final Bundle passProps;
     private final ScrollDirectionListener.OnScrollChanged scrollListener;
 
-    public ContentView(Context context, ReactInstanceManager reactInstanceManager, String moduleName, Bundle passProps, ScrollDirectionListener.OnScrollChanged scrollListener) {
+    public ContentView(Context context, ReactInstanceManager reactInstanceManager, String screenId, Bundle passProps, ScrollDirectionListener.OnScrollChanged scrollListener) {
         super(context);
         this.reactInstanceManager = reactInstanceManager;
-        this.moduleName = moduleName;
+        this.screenId = screenId;
         this.passProps = passProps;
         this.scrollListener = scrollListener;
     }
 
     public void init() {
-        startReactApplication(reactInstanceManager, moduleName, passProps);
+        startReactApplication(reactInstanceManager, screenId, passProps);
         new ScrollViewAttacher(this, scrollListener).attach();
     }
 

android/app/src/main/java/com/reactnativenavigation/views/TitleBar.java

@@ -9,6 +9,7 @@ import android.view.MenuInflater;
 
 import com.reactnativenavigation.R;
 import com.reactnativenavigation.animation.HideOnScrollAnimator;
+import com.reactnativenavigation.params.TitleBarButtonParams;
 
 import java.util.List;
 
@@ -24,7 +25,7 @@ public class TitleBar extends Toolbar {
         createMenu();
     }
 
-    public void setButtons(List<TitleBarButton.Params> buttons) {
+    public void setButtons(List<TitleBarButtonParams> buttons) {
         menu.clear();
 
         for (int i = 0; i < buttons.size(); i++) {