diff --git a/docs/Queries.md b/docs/Queries.md
index e82d786db..5b69027fb 100644
--- a/docs/Queries.md
+++ b/docs/Queries.md
@@ -187,23 +187,18 @@ const element = getByA11yValue({ min: 40 });
 
 The interface is the same as for other queries, but we won't provide full names so that they're harder to find by search engines.
 
-### `UNSAFE_ByType`, `ByType`
+### `UNSAFE_ByType`
 
 > Note: added in v1.4
 
-> This method has been **deprecated** and has been prepended with `UNSAFE_` prefix. In react-native-testing-library 2.x only the prefixed version will work.
+> This method has been marked unsafe, since it requires knowledge about implementation details of the component. Use responsibly.
 
 A method returning a `ReactTestInstance` with matching a React component type. Throws when no matches.
 
-### `UNSAFE_ByProps`, `ByProps`
+### `UNSAFE_ByProps`
 
-> This method has been **deprecated** and has been prepended with `UNSAFE_` prefix. In react-native-testing-library 2.x only the prefixed version will work.
+> This method has been marked unsafe, since it requires knowledge about implementation details of the component. Use responsibly.
 
 A method returning a `ReactTestInstance` with matching props object
 
-### `ByName`
-
-> This method has been **deprecated** because using it results in fragile tests that may break between minor React Native versions. **DON'T USE IT**. It will be removed in next major release (v2.0). Use [`getByTestId`](#bytestid) instead. It's listed here only for back-compat purposes for early adopters of the library
-A method returning a `ReactTestInstance` with matching a React component type. Throws when no matches.
-
 </details>
diff --git a/src/__tests__/__snapshots__/shallow.test.js.snap b/src/__tests__/__snapshots__/shallow.test.js.snap
deleted file mode 100644
index ac70b9743..000000000
--- a/src/__tests__/__snapshots__/shallow.test.js.snap
+++ /dev/null
@@ -1,21 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`shallow rendering React Test Instance 1`] = `
-<Text
-  testID="text-button"
->
-  Press me
-</Text>
-`;
-
-exports[`shallow rendering React elements 1`] = `
-<View
-  testID="2"
->
-  <Text
-    testID="text-button"
-  >
-    Press me
-  </Text>
-</View>
-`;
diff --git a/src/__tests__/debug.test.js b/src/__tests__/debug.test.js
index 0b49a0d1b..34d54541d 100644
--- a/src/__tests__/debug.test.js
+++ b/src/__tests__/debug.test.js
@@ -73,11 +73,11 @@ test('debug.deep', () => {
 test('debug.deep async test', async () => {
   // $FlowFixMe
   console.log = jest.fn();
-  const { toJSON, getByName } = render(
+  const { toJSON, getByText } = render(
     <Button onPress={jest.fn} text="Press me" />
   );
 
-  fireEvent.press(getByName('TouchableOpacity'));
+  fireEvent.press(getByText(/Press me/g));
   await flushMicrotasksQueue();
 
   debug.deep(toJSON());
diff --git a/src/__tests__/render.test.js b/src/__tests__/render.test.js
index e53e6f79a..52e35120f 100644
--- a/src/__tests__/render.test.js
+++ b/src/__tests__/render.test.js
@@ -109,51 +109,18 @@ test('getAllByTestId, queryAllByTestId', () => {
   expect(queryAllByTestId('nonExistentTestId')).toHaveLength(0);
 });
 
-test('getByName, queryByName', () => {
-  const { getByTestId, getByName, queryByName } = render(<Banana />);
-  const bananaFresh = getByTestId('bananaFresh');
-  const button = getByName('Button');
-
-  button.props.onPress();
-
-  expect(bananaFresh.props.children).toBe('fresh');
-
-  const sameButton = getByName(Button);
-  sameButton.props.onPress();
-
-  expect(bananaFresh.props.children).toBe('not fresh');
-  expect(() => getByName('InExistent')).toThrow('No instances found');
-  expect(() => getByName(Text)).toThrow('Expected 1 but found 6');
-
-  expect(queryByName('Button')).toBe(button);
-  expect(queryByName('InExistent')).toBeNull();
-});
-
-test('getAllByName, queryAllByName', () => {
-  const { getAllByName, queryAllByName } = render(<Banana />);
-  const [text, status, button] = getAllByName('Text');
-
-  expect(text.props.children).toBe('Is the banana fresh?');
-  expect(status.props.children).toBe('not fresh');
-  expect(button.props.children).toBe('Change freshness!');
-  expect(() => getAllByName('InExistent')).toThrow('No instances found');
-
-  expect(queryAllByName('Text')[1]).toBe(status);
-  expect(queryAllByName('InExistent')).toHaveLength(0);
-});
-
-test('getAllByType, queryAllByType', () => {
-  const { getAllByType, queryAllByType } = render(<Banana />);
-  const [text, status, button] = getAllByType(Text);
+test('UNSAFE_getAllByType, UNSAFE_queryAllByType', () => {
+  const { UNSAFE_getAllByType, UNSAFE_queryAllByType } = render(<Banana />);
+  const [text, status, button] = UNSAFE_getAllByType(Text);
   const InExistent = () => null;
 
   expect(text.props.children).toBe('Is the banana fresh?');
   expect(status.props.children).toBe('not fresh');
   expect(button.props.children).toBe('Change freshness!');
-  expect(() => getAllByType(InExistent)).toThrow('No instances found');
+  expect(() => UNSAFE_getAllByType(InExistent)).toThrow('No instances found');
 
-  expect(queryAllByType(Text)[1]).toBe(status);
-  expect(queryAllByType(InExistent)).toHaveLength(0);
+  expect(UNSAFE_queryAllByType(Text)[1]).toBe(status);
+  expect(UNSAFE_queryAllByType(InExistent)).toHaveLength(0);
 });
 
 test('getByText, queryByText', () => {
@@ -267,38 +234,38 @@ test('getAllByDisplayValue, queryAllByDisplayValue', () => {
   expect(queryAllByDisplayValue('no value')).toHaveLength(0);
 });
 
-test('getByProps, queryByProps', () => {
-  const { getByProps, queryByProps } = render(<Banana />);
-  const primaryType = getByProps({ type: 'primary' });
+test('UNSAFE_getByProps, UNSAFE_queryByProps', () => {
+  const { UNSAFE_getByProps, UNSAFE_queryByProps } = render(<Banana />);
+  const primaryType = UNSAFE_getByProps({ type: 'primary' });
 
   expect(primaryType.props.children).toBe('Change freshness!');
-  expect(() => getByProps({ type: 'inexistent' })).toThrow(
+  expect(() => UNSAFE_getByProps({ type: 'inexistent' })).toThrow(
     'No instances found'
   );
 
-  expect(queryByProps({ type: 'primary' })).toBe(primaryType);
-  expect(queryByProps({ type: 'inexistent' })).toBeNull();
+  expect(UNSAFE_queryByProps({ type: 'primary' })).toBe(primaryType);
+  expect(UNSAFE_queryByProps({ type: 'inexistent' })).toBeNull();
 });
 
-test('getAllByProp, queryAllByProps', () => {
-  const { getAllByProps, queryAllByProps } = render(<Banana />);
-  const primaryTypes = getAllByProps({ type: 'primary' });
+test('getAllByProp, UNSAFE_queryAllByProps', () => {
+  const { UNSAFE_getAllByProps, UNSAFE_queryAllByProps } = render(<Banana />);
+  const primaryTypes = UNSAFE_getAllByProps({ type: 'primary' });
 
   expect(primaryTypes).toHaveLength(1);
-  expect(() => getAllByProps({ type: 'inexistent' })).toThrow(
+  expect(() => UNSAFE_getAllByProps({ type: 'inexistent' })).toThrow(
     'No instances found'
   );
 
-  expect(queryAllByProps({ type: 'primary' })).toEqual(primaryTypes);
-  expect(queryAllByProps({ type: 'inexistent' })).toHaveLength(0);
+  expect(UNSAFE_queryAllByProps({ type: 'primary' })).toEqual(primaryTypes);
+  expect(UNSAFE_queryAllByProps({ type: 'inexistent' })).toHaveLength(0);
 });
 
 test('update', () => {
   const fn = jest.fn();
-  const { getByName, update, rerender } = render(<Banana onUpdate={fn} />);
-  const button = getByName('Button');
+  const { getByText, update, rerender } = render(<Banana onUpdate={fn} />);
+  const button = getByText(/Change/g);
 
-  button.props.onPress();
+  fireEvent.press(button);
 
   update(<Banana onUpdate={fn} />);
   rerender(<Banana onUpdate={fn} />);
@@ -345,9 +312,9 @@ test('debug', () => {
 test('debug changing component', () => {
   jest.spyOn(console, 'log').mockImplementation(x => x);
 
-  const { getByProps, debug } = render(<Banana />);
+  const { UNSAFE_getByProps, debug } = render(<Banana />);
 
-  fireEvent.press(getByProps({ type: 'primary' }));
+  fireEvent.press(UNSAFE_getByProps({ type: 'primary' }));
 
   debug();
 
diff --git a/src/__tests__/shallow.test.js b/src/__tests__/shallow.test.js
deleted file mode 100644
index 927ee1bfc..000000000
--- a/src/__tests__/shallow.test.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// @flow
-import React from 'react';
-import { View, Text } from 'react-native';
-import { shallow, render } from '..';
-
-type Props = {|
-  +dummyID?: string,
-|};
-
-const TextPress = ({ dummyID }: Props) => (
-  <View testID={dummyID}>
-    <Text testID="text-button">Press me</Text>
-  </View>
-);
-
-test('shallow rendering React elements', () => {
-  const { output } = shallow(<TextPress dummyID="2" />);
-
-  expect(output).toMatchSnapshot();
-});
-
-test('shallow rendering React Test Instance', () => {
-  const { getByTestId } = render(<TextPress />);
-  const { output } = shallow(getByTestId('text-button'));
-
-  expect(output).toMatchSnapshot();
-});
diff --git a/src/__tests__/waitForElement.test.js b/src/__tests__/waitForElement.test.js
index 04d19b432..5922f7312 100644
--- a/src/__tests__/waitForElement.test.js
+++ b/src/__tests__/waitForElement.test.js
@@ -36,9 +36,9 @@ class BananaContainer extends React.Component<{}, any> {
 }
 
 test('waits for element until it stops throwing', async () => {
-  const { getByTestId, getByName, queryByTestId } = render(<BananaContainer />);
+  const { getByTestId, getByText, queryByTestId } = render(<BananaContainer />);
 
-  fireEvent.press(getByName('TouchableOpacity'));
+  fireEvent.press(getByText(/Change/g));
 
   expect(queryByTestId('fresh')).toBeNull();
 
@@ -48,9 +48,9 @@ test('waits for element until it stops throwing', async () => {
 });
 
 test('waits for element until timeout is met', async () => {
-  const { getByTestId, getByName } = render(<BananaContainer />);
+  const { getByTestId, getByText } = render(<BananaContainer />);
 
-  fireEvent.press(getByName('TouchableOpacity'));
+  fireEvent.press(getByText(/Change/g));
 
   await expect(
     waitForElement(() => getByTestId('fresh'), 100)
diff --git a/src/helpers/debugShallow.js b/src/helpers/debugShallow.js
index 80e36e681..896e059d3 100644
--- a/src/helpers/debugShallow.js
+++ b/src/helpers/debugShallow.js
@@ -1,6 +1,6 @@
 // @flow
 import * as React from 'react';
-import { shallowInternal } from '../shallow';
+import shallow from '../shallow';
 import format from './format';
 
 /**
@@ -10,7 +10,7 @@ export default function debugShallow(
   instance: ReactTestInstance | React.Element<any>,
   message?: any
 ) {
-  const { output } = shallowInternal(instance);
+  const { output } = shallow(instance);
 
   if (message) {
     console.log(`${message}\n\n`, format(output));
diff --git a/src/helpers/errors.js b/src/helpers/errors.js
index edf108cbc..57fc641a4 100644
--- a/src/helpers/errors.js
+++ b/src/helpers/errors.js
@@ -25,44 +25,26 @@ export const createQueryByError = (error: Error, callsite: Function) => {
 };
 
 const warned = {
-  getByName: false,
-  getAllByName: false,
-  queryByName: false,
-  queryAllByName: false,
-
-  getByProps: false,
-  getAllByProps: false,
-  queryByProps: false,
-  queryAllByProps: false,
-
-  getByType: false,
-  getAllByType: false,
-  queryByType: false,
-  queryAllByType: false,
+  UNSAFE_getByProps: false,
+  UNSAFE_getAllByProps: false,
+  UNSAFE_queryByProps: false,
+  UNSAFE_queryAllByProps: false,
+
+  UNSAFE_getByType: false,
+  UNSAFE_getAllByType: false,
+  UNSAFE_queryByType: false,
+  UNSAFE_queryAllByType: false,
 };
 
-export function printDeprecationWarning(functionName: string) {
-  if (warned[functionName]) {
-    return;
-  }
-
-  console.warn(`
-  Deprecation Warning:
-  ${functionName} is not recommended for use and will be deleted in react-native-testing-library 2.x.
-  `);
-
-  warned[functionName] = true;
-}
-
 export function printUnsafeWarning(functionName: string) {
   if (warned[functionName]) {
     return;
   }
 
   console.warn(`
-  Deprecation Warning:
-  ${functionName} is not recommended for use and has been renamed to UNSAFE_${functionName}.
-  In react-native-testing-library 2.x only the UNSAFE_${functionName} name will work.
+  Warning:
+  ${functionName} promotes testing implementation details and is not recommended.
+  It may be removed in the future. Please test observable outcomes of rendering components.
   `);
 
   warned[functionName] = true;
diff --git a/src/helpers/getByAPI.js b/src/helpers/getByAPI.js
index b0bf792ad..19e99cd12 100644
--- a/src/helpers/getByAPI.js
+++ b/src/helpers/getByAPI.js
@@ -5,16 +5,11 @@ import {
   ErrorWithStack,
   createLibraryNotSupportedError,
   prepareErrorMessage,
-  printDeprecationWarning,
   printUnsafeWarning,
 } from './errors';
 
 const filterNodeByType = (node, type) => node.type === type;
 
-const filterNodeByName = (node, name) =>
-  typeof node.type !== 'string' &&
-  (node.type.displayName === name || node.type.name === name);
-
 const getNodeByText = (node, text) => {
   try {
     // eslint-disable-next-line
@@ -69,18 +64,6 @@ const getTextInputNodeByDisplayValue = (node, value) => {
   }
 };
 
-export const getByName = (instance: ReactTestInstance, warnFn?: Function) =>
-  function getByNameFn(name: string | React.ComponentType<any>) {
-    warnFn && warnFn('getByName');
-    try {
-      return typeof name === 'string'
-        ? instance.find(node => filterNodeByName(node, name))
-        : instance.findByType(name);
-    } catch (error) {
-      throw new ErrorWithStack(prepareErrorMessage(error), getByNameFn);
-    }
-  };
-
 export const getByType = (instance: ReactTestInstance, warnFn?: Function) =>
   function getByTypeFn(type: React.ComponentType<any>) {
     warnFn && warnFn('getByType');
@@ -141,19 +124,6 @@ export const getByTestId = (instance: ReactTestInstance) =>
     }
   };
 
-export const getAllByName = (instance: ReactTestInstance, warnFn?: Function) =>
-  function getAllByNameFn(name: string | React.ComponentType<any>) {
-    warnFn && warnFn('getAllByName');
-    const results =
-      typeof name === 'string'
-        ? instance.findAll(node => filterNodeByName(node, name))
-        : instance.findAllByType(name);
-    if (results.length === 0) {
-      throw new ErrorWithStack('No instances found', getAllByNameFn);
-    }
-    return results;
-  };
-
 export const getAllByType = (instance: ReactTestInstance, warnFn?: Function) =>
   function getAllByTypeFn(type: React.ComponentType<any>) {
     warnFn && warnFn('getAllByType');
@@ -234,23 +204,17 @@ export const getAllByTestId = (instance: ReactTestInstance) =>
 
 export const getByAPI = (instance: ReactTestInstance) => ({
   getByTestId: getByTestId(instance),
-  getByName: getByName(instance, printDeprecationWarning),
-  getByType: getByType(instance, printUnsafeWarning),
   getByText: getByText(instance),
   getByPlaceholder: getByPlaceholder(instance),
   getByDisplayValue: getByDisplayValue(instance),
-  getByProps: getByProps(instance, printUnsafeWarning),
   getAllByTestId: getAllByTestId(instance),
-  getAllByName: getAllByName(instance, printDeprecationWarning),
-  getAllByType: getAllByType(instance, printUnsafeWarning),
   getAllByText: getAllByText(instance),
   getAllByPlaceholder: getAllByPlaceholder(instance),
   getAllByDisplayValue: getAllByDisplayValue(instance),
-  getAllByProps: getAllByProps(instance, printUnsafeWarning),
 
   // Unsafe aliases
-  UNSAFE_getByType: getByType(instance),
-  UNSAFE_getAllByType: getAllByType(instance),
-  UNSAFE_getByProps: getByProps(instance),
-  UNSAFE_getAllByProps: getAllByProps(instance),
+  UNSAFE_getByType: getByType(instance, printUnsafeWarning),
+  UNSAFE_getAllByType: getAllByType(instance, printUnsafeWarning),
+  UNSAFE_getByProps: getByProps(instance, printUnsafeWarning),
+  UNSAFE_getAllByProps: getAllByProps(instance, printUnsafeWarning),
 });
diff --git a/src/helpers/queryByAPI.js b/src/helpers/queryByAPI.js
index e2c06b0a0..d19a33abb 100644
--- a/src/helpers/queryByAPI.js
+++ b/src/helpers/queryByAPI.js
@@ -2,35 +2,19 @@
 import * as React from 'react';
 import {
   getByTestId,
-  getByName,
   getByType,
   getByText,
   getByPlaceholder,
   getByDisplayValue,
   getByProps,
   getAllByTestId,
-  getAllByName,
   getAllByType,
   getAllByText,
   getAllByPlaceholder,
   getAllByDisplayValue,
   getAllByProps,
 } from './getByAPI';
-import {
-  createQueryByError,
-  printDeprecationWarning,
-  printUnsafeWarning,
-} from './errors';
-
-export const queryByName = (instance: ReactTestInstance, warnFn?: Function) =>
-  function queryByNameFn(name: string | React.ComponentType<any>) {
-    warnFn && warnFn('queryByName');
-    try {
-      return getByName(instance)(name);
-    } catch (error) {
-      return createQueryByError(error, queryByNameFn);
-    }
-  };
+import { createQueryByError, printUnsafeWarning } from './errors';
 
 export const queryByType = (instance: ReactTestInstance, warnFn?: Function) =>
   function queryByTypeFn(type: React.ComponentType<any>) {
@@ -88,18 +72,6 @@ export const queryByTestId = (instance: ReactTestInstance) =>
     }
   };
 
-export const queryAllByName = (
-  instance: ReactTestInstance,
-  warnFn?: Function
-) => (name: string | React.ComponentType<any>) => {
-  warnFn && warnFn('queryAllByName');
-  try {
-    return getAllByName(instance)(name);
-  } catch (error) {
-    return [];
-  }
-};
-
 export const queryAllByType = (
   instance: ReactTestInstance,
   warnFn?: Function
@@ -166,23 +138,17 @@ export const queryAllByTestId = (instance: ReactTestInstance) => (
 
 export const queryByAPI = (instance: ReactTestInstance) => ({
   queryByTestId: queryByTestId(instance),
-  queryByName: queryByName(instance, printDeprecationWarning),
-  queryByType: queryByType(instance, printUnsafeWarning),
   queryByText: queryByText(instance),
   queryByPlaceholder: queryByPlaceholder(instance),
   queryByDisplayValue: queryByDisplayValue(instance),
-  queryByProps: queryByProps(instance, printUnsafeWarning),
   queryAllByTestId: queryAllByTestId(instance),
-  queryAllByName: queryAllByName(instance, printDeprecationWarning),
-  queryAllByType: queryAllByType(instance, printUnsafeWarning),
   queryAllByText: queryAllByText(instance),
   queryAllByPlaceholder: queryAllByPlaceholder(instance),
   queryAllByDisplayValue: queryAllByDisplayValue(instance),
-  queryAllByProps: queryAllByProps(instance, printUnsafeWarning),
 
   // Unsafe aliases
-  UNSAFE_queryByType: queryByType(instance),
-  UNSAFE_queryAllByType: queryAllByType(instance),
-  UNSAFE_queryByProps: queryByProps(instance),
-  UNSAFE_queryAllByProps: queryAllByProps(instance),
+  UNSAFE_queryByType: queryByType(instance, printUnsafeWarning),
+  UNSAFE_queryAllByType: queryAllByType(instance, printUnsafeWarning),
+  UNSAFE_queryByProps: queryByProps(instance, printUnsafeWarning),
+  UNSAFE_queryAllByProps: queryAllByProps(instance, printUnsafeWarning),
 });
diff --git a/src/index.js b/src/index.js
index f4263745c..9199a93c5 100644
--- a/src/index.js
+++ b/src/index.js
@@ -5,7 +5,6 @@ import debug from './debug';
 import fireEvent from './fireEvent';
 import flushMicrotasksQueue from './flushMicrotasksQueue';
 import render from './render';
-import shallow from './shallow';
 import waitForElement from './waitForElement';
 
 export { act };
@@ -14,5 +13,4 @@ export { debug };
 export { fireEvent };
 export { flushMicrotasksQueue };
 export { render };
-export { shallow };
 export { waitForElement };
diff --git a/src/shallow.js b/src/shallow.js
index 576ac913a..283607e25 100644
--- a/src/shallow.js
+++ b/src/shallow.js
@@ -1,12 +1,11 @@
 // @flow
 import * as React from 'react';
 import ShallowRenderer from 'react-test-renderer/shallow'; // eslint-disable-line import/no-extraneous-dependencies
-import { printDeprecationWarning } from './helpers/errors';
 
 /**
  * Renders test component shallowly using react-test-renderer/shallow
  */
-export function shallowInternal(
+export default function shallowInternal(
   instance: ReactTestInstance | React.Element<any>
 ) {
   const renderer = new ShallowRenderer();
@@ -17,11 +16,3 @@ export function shallowInternal(
     output: renderer.getRenderOutput(),
   };
 }
-
-export default function shallow(
-  instance: ReactTestInstance | React.Element<any>
-) {
-  printDeprecationWarning('shallow');
-
-  return shallowInternal(instance);
-}
diff --git a/typings/__tests__/index.test.tsx b/typings/__tests__/index.test.tsx
index c4a5ad020..c6a3f5047 100644
--- a/typings/__tests__/index.test.tsx
+++ b/typings/__tests__/index.test.tsx
@@ -32,10 +32,8 @@ const TestComponent = () => (
 const tree = render(<TestComponent />);
 
 // getByAPI tests
-const getByNameString: ReactTestInstance = tree.getByName('View');
-const getByNameContructor: ReactTestInstance = tree.getByName(View);
-const getByType: ReactTestInstance = tree.getByType(View);
-const getByTypeWithRequiredProps: ReactTestInstance = tree.getByType(
+const getByType: ReactTestInstance = tree.UNSAFE_getByType(View);
+const getByTypeWithRequiredProps: ReactTestInstance = tree.UNSAFE_getByType(
   ElementWithRequiredProps
 );
 const getByTextString: ReactTestInstance = tree.getByText('<View />');
@@ -52,30 +50,24 @@ const getByDisplayValueString: ReactTestInstance = tree.getByDisplayValue(
 const getByDisplayValueRegExp: ReactTestInstance = tree.getByDisplayValue(
   /value/g
 );
-const getByProps: ReactTestInstance = tree.getByProps({ value: 2 });
+const getByProps: ReactTestInstance = tree.UNSAFE_getByProps({ value: 2 });
 const getByTestId: ReactTestInstance = tree.getByTestId('test-id');
 const getAllByTestId: ReactTestInstance[] = tree.getAllByTestId('test-id');
-const getAllByNameString: Array<ReactTestInstance> = tree.getAllByName('View');
-const getAllByNameConstructor: Array<ReactTestInstance> = tree.getAllByName(
-  View
-);
-const getAllByType: Array<ReactTestInstance> = tree.getAllByType(View);
+const getAllByType: Array<ReactTestInstance> = tree.UNSAFE_getAllByType(View);
 const getAllByTypeWithRequiredProps: Array<
   ReactTestInstance
-> = tree.getAllByType(ElementWithRequiredProps);
+> = tree.UNSAFE_getAllByType(ElementWithRequiredProps);
 const getAllByTextString: Array<ReactTestInstance> = tree.getAllByText(
   '<View />'
 );
 const getAllByTextRegExp: Array<ReactTestInstance> = tree.getAllByText(/Text/g);
-const getAllByProps: Array<ReactTestInstance> = tree.getAllByProps({
+const getAllByProps: Array<ReactTestInstance> = tree.UNSAFE_getAllByProps({
   value: 2,
 });
 
 // queuryByAPI tests
-const queryByNameString: ReactTestInstance | null = tree.queryByName('View');
-const queryByNameConstructor: ReactTestInstance | null = tree.queryByName(View);
-const queryByType: ReactTestInstance | null = tree.queryByType(View);
-const queryByTypeWithRequiredProps: ReactTestInstance | null = tree.queryByType(
+const queryByType: ReactTestInstance | null = tree.UNSAFE_queryByType(View);
+const queryByTypeWithRequiredProps: ReactTestInstance | null = tree.UNSAFE_queryByType(
   ElementWithRequiredProps
 );
 const queryByTextString: ReactTestInstance | null = tree.queryByText('View');
@@ -92,21 +84,15 @@ const queryByDisplayValueString: ReactTestInstance | null = tree.queryByDisplayV
 const queryByDisplayValueRegExp: ReactTestInstance | null = tree.queryByDisplayValue(
   /value/g
 );
-const queryByProps: ReactTestInstance | null = tree.queryByProps({ value: 2 });
+const queryByProps: ReactTestInstance | null = tree.UNSAFE_queryByProps({ value: 2 });
 const queryByTestId: ReactTestInstance | null = tree.queryByTestId('test-id');
 const queryAllByTestId: ReactTestInstance[] | null = tree.queryAllByTestId(
   'test-id'
 );
-const queryAllByNameString: Array<ReactTestInstance> = tree.queryAllByName(
-  'View'
-);
-const queryAllByNameConstructor: Array<ReactTestInstance> = tree.queryAllByName(
-  View
-);
-const queryAllByType: Array<ReactTestInstance> = tree.queryAllByType(View);
+const queryAllByType: Array<ReactTestInstance> = tree.UNSAFE_queryAllByType(View);
 const queryAllByTypeWithRequiredProps: Array<
   ReactTestInstance
-> = tree.queryAllByType(ElementWithRequiredProps);
+> = tree.UNSAFE_queryAllByType(ElementWithRequiredProps);
 const queryAllByTextString: Array<ReactTestInstance> = tree.queryAllByText(
   'View'
 );
@@ -182,12 +168,12 @@ tree.rerender(<View />);
 tree.unmount();
 
 // fireEvent API tests
-fireEvent(getByNameString, 'press');
-fireEvent(getByNameString, 'press', 'data');
-fireEvent(getByNameString, 'press', 'param1', 'param2');
-fireEvent.press(getByNameString);
-fireEvent.changeText(getByNameString, 'string');
-fireEvent.scroll(getByNameString, 'eventData');
+fireEvent(getByTextString, 'press');
+fireEvent(getByTextString, 'press', 'data');
+fireEvent(getByTextString, 'press', 'param1', 'param2');
+fireEvent.press(getByTextString);
+fireEvent.changeText(getByTextString, 'string');
+fireEvent.scroll(getByTextString, 'eventData');
 
 // shallow API
 const shallowTree: { output: React.ReactElement<any> } = shallow(
@@ -199,8 +185,8 @@ const waitForFlush: Promise<any> = flushMicrotasksQueue();
 // debug API
 debug(<TestComponent />);
 debug(<TestComponent />, 'message');
-debug(getByNameString);
-debug(getByNameString, 'message');
+debug(getByTextString);
+debug(getByTextString, 'message');
 debug.shallow(<TestComponent />);
 debug.shallow(<TestComponent />, 'message');
 debug.deep(<TestComponent />);
@@ -208,11 +194,11 @@ debug.deep(<TestComponent />, 'message');
 debug.deep(tree.toJSON());
 
 const waitBy: Promise<ReactTestInstance> = waitForElement<ReactTestInstance>(
-  () => tree.getByName('View')
+  () => tree.getByText('View')
 );
 const waitByAll: Promise<Array<ReactTestInstance>> = waitForElement<
   Array<ReactTestInstance>
->(() => tree.getAllByName('View'), 1000, 50);
+>(() => tree.getAllByText('View'), 1000, 50);
 
 act(() => {
   render(<TestComponent />);
diff --git a/typings/index.d.ts b/typings/index.d.ts
index 1c03ed410..4b917fb30 100644
--- a/typings/index.d.ts
+++ b/typings/index.d.ts
@@ -3,22 +3,16 @@ import { AccessibilityState, AccessibilityStates, AccessibilityRole } from 'reac
 import { ReactTestInstance, ReactTestRendererJSON } from 'react-test-renderer';
 
 export interface GetByAPI {
-  getByName: (name: React.ReactType | string) => ReactTestInstance;
-  getByType: <P>(type: React.ComponentType<P>) => ReactTestInstance;
   getByText: (text: string | RegExp) => ReactTestInstance;
   getByPlaceholder: (placeholder: string | RegExp) => ReactTestInstance;
   getByDisplayValue: (value: string | RegExp) => ReactTestInstance;
-  getByProps: (props: Record<string, any>) => ReactTestInstance;
   getByTestId: (testID: string) => ReactTestInstance;
   getAllByTestId: (testID: string) => Array<ReactTestInstance>;
-  getAllByName: (name: React.ReactType | string) => Array<ReactTestInstance>;
-  getAllByType: <P>(type: React.ComponentType<P>) => Array<ReactTestInstance>;
   getAllByText: (text: string | RegExp) => Array<ReactTestInstance>;
   getAllByPlaceholder: (
     placeholder: string | RegExp
   ) => Array<ReactTestInstance>;
   getAllByDisplayValue: (value: string | RegExp) => Array<ReactTestInstance>;
-  getAllByProps: (props: Record<string, any>) => Array<ReactTestInstance>;
 
 
   // Unsafe aliases
@@ -29,22 +23,13 @@ export interface GetByAPI {
 }
 
 export interface QueryByAPI {
-  queryByName: (name: React.ReactType | string) => ReactTestInstance | null;
-  queryByType: <P>(type: React.ComponentType<P>) => ReactTestInstance | null;
   queryByText: (name: string | RegExp) => ReactTestInstance | null;
   queryByPlaceholder: (
     placeholder: string | RegExp
   ) => ReactTestInstance | null;
   queryByDisplayValue: (value: string | RegExp) => ReactTestInstance | null;
-  queryByProps: (props: Record<string, any>) => ReactTestInstance | null;
   queryByTestId: (testID: string) => ReactTestInstance | null;
   queryAllByTestId: (testID: string) => Array<ReactTestInstance> | null;
-  queryAllByName: (
-    name: React.ReactType | string
-  ) => Array<ReactTestInstance> | [];
-  queryAllByType: <P>(
-    type: React.ComponentType<P>
-  ) => Array<ReactTestInstance> | [];
   queryAllByText: (text: string | RegExp) => Array<ReactTestInstance> | [];
   queryAllByPlaceholder: (
     placeholder: string | RegExp
@@ -52,9 +37,6 @@ export interface QueryByAPI {
   queryAllByDisplayValue: (
     value: string | RegExp
   ) => Array<ReactTestInstance> | [];
-  queryAllByProps: (
-    props: Record<string, any>
-  ) => Array<ReactTestInstance> | [];
 
   // Unsafe aliases
   UNSAFE_queryByType: <P>(type: React.ComponentType<P>) => ReactTestInstance | null,