diff --git a/README.md b/README.md
index 02fb34c..f6c72e2 100644
--- a/README.md
+++ b/README.md
@@ -46,13 +46,13 @@ npm install centro-ui --save
 2. __Import in your project__
 
 ```
-import { CnContainer } from 'centro-ui';
+import { Container } from 'centro-ui';
 ```
 
 3. __Invoke the component(s) in your view__
 
 ```
-<CnContainer> </CnContainer>
+<Container> </Container>
 ```
 
 4.  __Add interactivity__
@@ -104,11 +104,11 @@ function init(bundle, parent, options) {
                 <Pano source={asset('bg3.jpg')}/>
 
 
-                /* CnContainer acts as a screen that contains all components. Can be placed in different directions */
-                <CnContainer backgroundColor="transparent">
+                /* Container acts as a screen that contains all components. Can be placed in different directions */
+                <Container backgroundColor="transparent">
 
                     /* Add a navbar  */
-                    <CnNavbar>
+                    <Navbar>
                         <CnNavItem>
                             Hello CentroUI
                         </CnNavItem>
@@ -124,20 +124,20 @@ function init(bundle, parent, options) {
                         <CnNavItem>
                             Home
                         </CnNavItem>
-                    </CnNavbar>
+                    </Navbar>
 
                     /* CnRow contains all items in a given row */
                     <CnRow>
                         /* List different items */
-                        <CnList>
-                            <CnListItem>
+                        <List>
+                            <ListItem>
                                 List Item 1
-                            </CnListItem>
+                            </ListItem>
 
-                            <CnListItem>
+                            <ListItem>
                                 List Item 2
-                            </CnListItem>
-                        </CnList>
+                            </ListItem>
+                        </List>
 
                         /* Simple card for displaying different types of content */
                         <CnCard>
@@ -166,7 +166,7 @@ function init(bundle, parent, options) {
                             </CnCardFooter>
                         </CnCard>
                     </CnRow>
-                </CnContainer>
+                </Container>
 
             </View>
 ```
diff --git a/components/button/button.js b/components/button/button.js
index 336ea98..5d7b6f6 100644
--- a/components/button/button.js
+++ b/components/button/button.js
@@ -15,7 +15,7 @@ const DEFAULT_ACTIVE_COLOR = "rgba(0,0,0,0.2)"
 const DEFAULT_ACTIVE_BORDER_COLOR = "#0275d8";
 const DEFAULT_INACTIVE_BORDER_COLOR = "#eceeef";
 
-export default class CnButton extends React.Component {
+export default class Button extends React.Component {
     constructor(props) {
         super(props);
     }
diff --git a/components/core/container.js b/components/core/container.js
index 12b4712..87407b5 100644
--- a/components/core/container.js
+++ b/components/core/container.js
@@ -7,7 +7,7 @@ import {
 } from 'react-vr';
 
 
-export default class CnContainer extends React.Component {
+export default class Container extends React.Component {
 
 
     constructor(props) {
diff --git a/components/core/row.js b/components/core/row.js
deleted file mode 100644
index 5d0098d..0000000
--- a/components/core/row.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import React from 'react';
-import {
-    AppRegistry,
-    asset,
-    Pano,
-    Text,
-    View,
-    Plane,
-
-
-} from 'react-vr';
-
-
-export default class CnRow extends React.Component {
-
-
-    constructor(props) {
-        super(props);
-    }
-
-    render() {
-
-        return (
-            <View
-                style={{
-                display:  'flex',
-                layoutOrigin: [0, 0],
-                margin: 0.01,
-                flex: 1,
-                flexWrap: 'nowrap',
-                justifyContent: 'flex-start',
-                flexDirection: 'row',
-            }}>
-
-
-                {this.props.children}
-
-
-            </ View >
-        );
-    }
-};
-
-
diff --git a/components/list/list.js b/components/list/list.js
index f1127d6..72a8967 100644
--- a/components/list/list.js
+++ b/components/list/list.js
@@ -7,9 +7,9 @@ import {
     Plane,
 } from 'react-vr';
 import View from '../core/view'
-import CnButton from '../button/button'
+import Button from '../button/button'
 
-export default class CnList extends React.Component {
+export default class List extends React.Component {
 
     constructor(props) {
         super(props);
@@ -73,19 +73,19 @@ export default class CnList extends React.Component {
         var disabledDown = startRowsIndex + visibleRows >= data.length
         return (
             <View {...this.props}>
-                <CnButton onClick={this.scrollUp} disabled={disabledUp} bg="transparent">
+                <Button onClick={this.scrollUp} disabled={disabledUp} bg="transparent">
                     <View hcenter h={0.1}>
                         <Text style={{fontSize: 0.09}}>{disabledUp ? " " : "..."}</Text>
                     </View>
-                </CnButton>
+                </Button>
                 <View border={{width: 0.01}}>
                     {this.renderRows()}
                 </View>
-                <CnButton onClick={this.scrollDown} disabled={disabledDown} bg="transparent">
+                <Button onClick={this.scrollDown} disabled={disabledDown} bg="transparent">
                     <View hcenter h={0.1}>
                         <Text style={{fontSize: 0.09}}>{disabledDown ? " " : "..."}</Text>
                     </View>
-                </CnButton>
+                </Button>
             </View>
         );
     }
diff --git a/components/navbar/navbar.js b/components/navbar/navbar.js
index 2fca763..6f09f9e 100644
--- a/components/navbar/navbar.js
+++ b/components/navbar/navbar.js
@@ -11,7 +11,7 @@ import {
 } from 'react-vr';
 
 
-export default class CnNavbar extends React.Component {
+export default class Navbar extends React.Component {
 
     constructor(props) {
         super(props);
diff --git a/components/text-input/text-input.js b/components/text-input/text-input.js
index f7e48d4..ba2c5db 100644
--- a/components/text-input/text-input.js
+++ b/components/text-input/text-input.js
@@ -3,7 +3,7 @@ import { View, VrButton,  Text } from 'react-vr';
 import Keyboard from './keyboard';
 import Scroll from './text-input-scroll'
 
-class CnTextInput  extends React.Component {
+class TextInput  extends React.Component {
     constructor(props) {
         super(props);
         this.state = {
@@ -488,4 +488,4 @@ class CnTextInput  extends React.Component {
     }
 }
 
-export default CnTextInput;
\ No newline at end of file
+export default TextInput;
\ No newline at end of file
diff --git a/examples/index.vr.js b/examples/index.vr.js
index 9e13966..6bac006 100755
--- a/examples/index.vr.js
+++ b/examples/index.vr.js
@@ -1,18 +1,18 @@
 import React from 'react';
 import { AppRegistry, Text } from 'react-vr';
-import CnContainer from '../components/core/container';
+import Container from '../components/core/container';
 import View from '../components/core/view';
-import CnButton from '../components/button/button';
+import Button from '../components/button/button';
 import CnIcon from '../components/button/icon';
 import CnCardContent from '../components/card/card-content';
 import CnCardFooter from '../components/card/card-footer';
 import CnCardHeader from '../components/card/card-header';
-import CnRow from '../components/core/row';
+
 
 export default class Example extends React.Component {
     render() {
         return (
-            <CnContainer>
+            <Container>
                 <View row flex>
                     <View vcenter hcenter bg="red" flex>
                         <Text style={{color: '#000'}}>dsadas</Text>
@@ -24,7 +24,7 @@ export default class Example extends React.Component {
                         <Text style={{color: '#000'}}>dsadas</Text>
                     </View>
                 </View>
-            </CnContainer>
+            </Container>
         );
     }
 }
diff --git a/index.js b/index.js
index 32add54..ebbf879 100644
--- a/index.js
+++ b/index.js
@@ -1,29 +1,22 @@
 
-import CnContainer from "./components/core/container"
-import CnNavbar from "./components/navbar/navbar"
-import CnNavItem from "./components/navbar/nav-item"
+import Container from "./components/core/container"
+import Navbar from "./components/navbar/navbar"
+import NavItem from "./components/navbar/nav-item"
 import View from "./components/core/view"
-import CnRow from "./components/core/row"
-import CnCardHeader from "./components/card/card-header"
-import CnCardContent from "./components/card/card-content"
-import CnCardFooter from "./components/card/card-footer"
-import CnTextInput from "./components/text-input/text-input"
-import CnList from "./components/list/list"
-import CnListItem from "./components/list/list-item"
-
+import TextInput from "./components/text-input/text-input"
+import List from "./components/list/list"
+import ListItem from "./components/list/list-item"
+import Button from "./components/button/button"
 
 
 
 export {
     View,
-    CnContainer,
-    CnRow,
-    CnNavbar,
-    CnNavItem,
-    CnCardHeader,
-    CnCardContent,
-    CnCardFooter,
-    CnTextInput,
-    CnList,
-    CnListItem,
+    Container,
+    Navbar,
+    Button,
+    NavItem,
+    TextInput,
+    List,
+    ListItem,
 };