diff --git a/README.md b/README.md
index f356415..d00024f 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,12 @@ ImageKit is a complete media storage, optimization, and transformation solution
 
 ## Breaking changes
 
+### Upgrading from 4.x to 5.x version
+
+1. `IKContext` has been removed.
+
+* In version 5.0.0, we have replaced `IKContext` with [`ImageKitProvider`](#ImageKitProvider) and introduced a new component called [`ImageKitContext`](#ImageKitContext).
+
 ### Upgrading from 3.x to 4.x version
 
 1. Overlay syntax update
@@ -81,18 +87,18 @@ yarn add imagekitio-react
 Import components in your code:
 
 ```js
-import { IKImage, IKVideo, IKContext, IKUpload } from 'imagekitio-react'
+import { IKImage, IKVideo, ImageKitProvider, IKUpload, ImageKitContext } from 'imagekitio-react'
 ```
 
 ### Quick examples
 
 #### Image & video rendering and transformations
 ```js
-<IKContext urlEndpoint="https://ik.imagekit.io/your_imagekit_id">
+<ImageKitProvider urlEndpoint="https://ik.imagekit.io/your_imagekit_id">
   // Render an image using a relative path - https://ik.imagekit.io/your_imagekit_id/default-image.jpg
   <IKImage path="/default-image.jpg" />
 
-  // Overriding urlEndpoint defined in parent IkContext - https://www.custom-domain.com/default-image.jpg
+  // Overriding urlEndpoint defined in parent ImageKitProvider - https://www.custom-domain.com/default-image.jpg
   <IKImage urlEndpoint="https://www.custom-domain.com" path="/default-image.jpg" />
 
   // Render an image using an absolute URL - https://www1.custom-domain.com/default-image.jpg?tr=w-100
@@ -119,12 +125,12 @@ import { IKImage, IKVideo, IKContext, IKUpload } from 'imagekitio-react'
     transformation={[{ height: 200, width: 200, q: 50 }]}
     controls={true}
   />
-</IKContext>
+</ImageKitProvider>
 ```
 
 #### Image lazy loading and low-quality placeholder
 ```js
-<IKContext urlEndpoint="https://ik.imagekit.io/your_imagekit_id">
+<ImageKitProvider urlEndpoint="https://ik.imagekit.io/your_imagekit_id">
   // Lazy loading image
   <IKImage
     path="/default-image.jpg"
@@ -168,13 +174,13 @@ import { IKImage, IKVideo, IKContext, IKUpload } from 'imagekitio-react'
     loading="lazy"
     lqip={{ active: true }}
   />
-</IKContext>
+</ImageKitProvider>
 ```
 
 #### File upload example
 ```js
-// Ensure you pass publicKey, urlEndpoint, and authenticator function to the parent IKContext component or to the IKUpload component directly.
-<IKContext
+// Ensure you pass publicKey, urlEndpoint, and authenticator function to the parent ImageKitProvider component or to the IKUpload component directly.
+<ImageKitProvider
   publicKey="your_public_api_key"
   urlEndpoint="https://ik.imagekit.io/your_imagekit_id"
   authenticator={()=>Promise} 
@@ -207,7 +213,7 @@ import { IKImage, IKVideo, IKContext, IKUpload } from 'imagekitio-react'
     }}
     checks={`"file.size" < "1mb"`} // To run server side checks before uploading files. Notice the quotes around file.size and 1mb.
   />
-</IKContext>
+</ImageKitProvider>
 ```
 
 ## Demo application
@@ -216,26 +222,27 @@ import { IKImage, IKVideo, IKContext, IKUpload } from 'imagekitio-react'
 
 ## Components
 
-The library includes 5 Components:
+The library includes 6 Components:
 
-* [`IKContext`](#IKContext) for defining options like `urlEndpoint`, `publicKey` or `authenticator` to all children elements. This component does not render anything.
+* [`ImageKitProvider`](#ImageKitProvider) for defining options like `urlEndpoint`, `publicKey` or `authenticator` to all children elements. This component does not render anything.
 * `IKImage` for [image resizing](#image-resizing). This renders a `<img>` tag.
 * `IKVideo` for [video resizing](#video-resizing). This renders a `<video>` tag.
 * `IKUpload`for client-side [file uploading](#file-upload). This renders a `<input type="file">` tag.
 * `IKCore` for [Core SDK](#ikcore), This exposes methods from [ImageKit javascript SDK](https://github.com/imagekit-developer/imagekit-javascript) like url and upload.
+* [`ImageKitContext`](#ImageKitContext) is a context used to provide access to options such as `urlEndpoint`, `publicKey`, `ikClient` or `authenticator` to child components within `ImageKitProvider`. It does not render any UI elements.
 
-## IKContext
+## ImageKitProvider
 
-To use this SDK, you need to provide it with a few configuration parameters. You can use a parent `IKContext` component to define common options for all children `IKImage`, `IKVideo` or `IKupload` components. For example:
+To use this SDK, you need to provide it with a few configuration parameters. You can use a parent `ImageKitProvider` component to define common options for all children `IKImage`, `IKVideo` or `IKupload` components. For example:
 
 ```js
-<IKContext
+<ImageKitProvider
   urlEndpoint="https://ik.imagekit.io/your_imagekit_id"  // Required. Default URL-endpoint is https://ik.imagekit.io/your_imagekit_id
   publicKey="your_public_api_key" // optional
   transformationPosition="path" // optional
   authenticator={()=>Promise} // optional
   <IKImage path="/default-image.jpg" />
-</IKContext>
+</ImageKitProvider>
 ```
 
 will render:
@@ -256,7 +263,7 @@ The `IKImage` component renders an `img` tag. It is used for rendering and manip
 
 | Prop                   | Type             | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
 | :--------------------- | :--------------- | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| urlEndpoint            | String           | Optional. The base URL to be appended before the path of the image. If not specified, the URL-endpoint specified in the parent `IKContext` component is used. For example, https://ik.imagekit.io/your_imagekit_id/endpoint/                                                                                                                                                                                                                                                                                                                                                                                                                                      |
+| urlEndpoint            | String           | Optional. The base URL to be appended before the path of the image. If not specified, the URL-endpoint specified in the parent `ImageKitProvider` component is used. For example, https://ik.imagekit.io/your_imagekit_id/endpoint/                                                                                                                                                                                                                                                                                                                                                                                                                                      |
 | path                   | String           | Conditional. This is the path at which the image exists. For example, `/path/to/image.jpg`. Either the `path` or `src` parameter needs to be specified for URL generation.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        |
 | src                    | String           | Conditional. This is the complete URL of an image already mapped to ImageKit. For example, `https://ik.imagekit.io/your_imagekit_id/endpoint/path/to/image.jpg`. Either the `path` or `src` parameter needs to be specified for URL generation.                                                                                                                                                                                                                                                                                                                                                                                                                   |
 | transformation         | Array of objects | Optional. An array of objects specifying the transformation to be applied in the URL. The transformation name and the value should be specified as a key-value pair in the object. See list of [different tranformations](#list-of-supported-transformations). Different steps of a [chained transformation](https://docs.imagekit.io/features/image-transformations/chained-transformations) can be specified as the Array's different objects. The complete list of supported transformations in the SDK and some examples of using them are given later. If you use a transformation name that is not specified in the SDK, it is applied in the URL as it is. |
@@ -268,7 +275,7 @@ The `IKImage` component renders an `img` tag. It is used for rendering and manip
 ### Basic resizing examples
 
 ```js
-<IKContext urlEndpoint="https://ik.imagekit.io/your_imagekit_id">
+<ImageKitProvider urlEndpoint="https://ik.imagekit.io/your_imagekit_id">
   // Image from related file path with no transformations - https://ik.imagekit.io/your_imagekit_id/default-image.jpg
   <IKImage
     path="/default-image.jpg"
@@ -295,7 +302,7 @@ The `IKImage` component renders an `img` tag. It is used for rendering and manip
       custom: 'value'
     }]}
   />
-</IKContext>
+</ImageKitProvider>
 ```
 
 The `transformation` prop is an array of objects. Each object can have the following properties. When you specify more than one object, each object is added as a chained transformation. For example:
@@ -531,13 +538,13 @@ You have the option to lazy-load the original image only when the user scrolls n
 ### Overriding urlEndpoint for a particular image
 You can use `urlEndpoint` prop in an individual `IKImage` to change url for that image. For example:
 ```js
-<IKContext urlEndpoint="https://ik.imagekit.io/your_imagekit_id">
-  // Render an image using parent IKContext urlEndpont - https://ik.imagekit.io/your_imagekit_id/default-image.jpg
+<ImageKitProvider urlEndpoint="https://ik.imagekit.io/your_imagekit_id">
+  // Render an image using parent ImageKitProvider urlEndpont - https://ik.imagekit.io/your_imagekit_id/default-image.jpg
   <IKImage path="/default-image.jpg" />
 
-  // Overriding urlEndpoint defined in parent IkContext - https://www.custom-domain.com/default-image.jpg
+  // Overriding urlEndpoint defined in parent ImageKitProvider - https://www.custom-domain.com/default-image.jpg
   <IKImage urlEndpoint="https://www.custom-domain.com" path="/default-image.jpg" />
-</IKContext>
+</ImageKitProvider>
 ```
 
 ## Video resizing
@@ -546,7 +553,7 @@ The `IKVideo` component renders a `video` tag. It is used for rendering and mani
 
 | Prop                   | Type             | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
 | :--------------------- | :--------------- | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| urlEndpoint            | String           | Optional. The base URL to be appended before the path of the video. If not specified, the URL-endpoint specified in the parent `IKContext` component is used. For example, https://ik.imagekit.io/your_imagekit_id/endpoint/                                                                                                                                                                                                                                                      |
+| urlEndpoint            | String           | Optional. The base URL to be appended before the path of the video. If not specified, the URL-endpoint specified in the parent `ImageKitProvider` component is used. For example, https://ik.imagekit.io/your_imagekit_id/endpoint/                                                                                                                                                                                                                                                      |
 | path                   | String           | Conditional. This is the path at which the video exists. For example, `/path/to/video.mp4`. Either the `path` or `src` parameter needs to be specified for URL generation.                                                                                                                                                                                                                                                                                                        |
 | src                    | String           | Conditional. This is the complete URL of a video already mapped to ImageKit. For example, `https://ik.imagekit.io/your_imagekit_id/endpoint/path/to/video.mp4`. Either the `path` or `src` parameter needs to be specified for URL generation.                                                                                                                                                                                                                                    |
 | transformation         | Array of objects | Optional. An array of objects specifying the transformation to be applied in the URL. The transformation name and the value should be specified as a key-value pair in the object. See list of [different tranformations](#list-of-supported-transformations). The complete list of supported transformations in the SDK and some examples of using them are given later. If you use a transformation name that is not specified in the SDK, it gets applied as it is in the URL. |
@@ -556,7 +563,7 @@ The `IKVideo` component renders a `video` tag. It is used for rendering and mani
 ### Basic video resizing examples
 
 ```js
-<IKContext urlEndpoint="https://ik.imagekit.io/demo/your_imagekit_id">
+<ImageKitProvider urlEndpoint="https://ik.imagekit.io/demo/your_imagekit_id">
   // Video from related file path with no transformations - https://ik.imagekit.io/demo/your_imagekit_id/sample-video.mp4
   <IKVideo
     path="/sample-video.mp4"
@@ -580,7 +587,7 @@ The `IKVideo` component renders a `video` tag. It is used for rendering and mani
       custom: 'value'
     }]}
   />
-</IKContext>
+</ImageKitProvider>
 ```
 
 The `transformation` prop is an array of objects. Each object can have the following properties.
@@ -624,13 +631,13 @@ The SDK provides the `IKUpload` component to upload files to the [ImageKit Media
 | overrideParameters      | Function callback                                          | Optional. This function accepts the `File` object as an argument and should return a JSON value, e.g., `{fileName: "new-file-name.jpg"}.` Use this to programmatically override `fileName`, `useUniqueFileName`, `tags`, `folder`, `isPrivateFile`, `customCoordinates`, `extensions`, `webhookUrl`, `overwriteFile`, `overwriteAITags`, `overwriteTags`, `overwriteCustomMetadata`, `customMetadata`, `transformation`, and `checks` parameters. |
 | onSuccess               | Function callback                                          | Optional. Called if the upload is successful. The first and only argument is the response JSON from the upload API. The request-id, response headers, and HTTP status code are also accessible using the $ResponseMetadata key that is exposed from the [javascript sdk](https://github.com/imagekit-developer/imagekit-javascript#access-request-id-other-response-headers-and-http-status-code)                       |
 | onError                 | Function callback                                          | Optional. Called if upload results in an error. The first and only argument is the error received from the upload API                                                                                                                                                                                                                                                                                                   |
-| urlEndpoint             | String                                                     | Optional. If not specified, the URL-endpoint specified in the parent `IKContext` component is used. For example, https://ik.imagekit.io/your_imagekit_id/endpoint/                                                                                                                                                                                                                                                      |
-| publicKey               | String                                                     | Optional. If not specified, the `publicKey` specified in the parent `IKContext` component is used.                                                                                                                                                                                                                                                                                                                      |
-| authenticator           | ()=>Promise<{signature:string,token:string,expiry:number}> | Optional. If not specified, the `authenticator` specified in the parent `IKContext` component is used.                                                                                                                                                                                                                                                                                                                  |
+| urlEndpoint             | String                                                     | Optional. If not specified, the URL-endpoint specified in the parent `ImageKitProvider` component is used. For example, https://ik.imagekit.io/your_imagekit_id/endpoint/                                                                                                                                                                                                                                                      |
+| publicKey               | String                                                     | Optional. If not specified, the `publicKey` specified in the parent `ImageKitProvider` component is used.                                                                                                                                                                                                                                                                                                                      |
+| authenticator           | ()=>Promise<{signature:string,token:string,expiry:number}> | Optional. If not specified, the `authenticator` specified in the parent `ImageKitProvider` component is used.                                                                                                                                                                                                                                                                                                                  |
 | checks | String | Optional. Run server-side checks before uploading files. For example, `"file.size" < "1mb"` will check if the file size is less than 1 MB. Check [Upload API docs](https://imagekit.io/docs/api-reference/upload-file/upload-file#upload-api-checks) to learn more. Notice the quotes around `file.size` and `1mb`; otherwise, you will get an error `Your request contains invalid syntax for the checks parameter.` |
 
 
-> Make sure that you have specified `authenticator` and `publicKey` in `IKUpload` or in the parent `IKContext` component as a prop. The authenticator expects an asynchronous function that resolves with an object containing the necessary security parameters i.e `signature`, `token`, and `expire`.
+> Make sure that you have specified `authenticator` and `publicKey` in `IKUpload` or in the parent `ImageKitProvider` component as a prop. The authenticator expects an asynchronous function that resolves with an object containing the necessary security parameters i.e `signature`, `token`, and `expire`.
 
 #### Abort upload
 
@@ -657,7 +664,7 @@ const onSuccess = (res) => {
   console.log(res);
 };
 
-<IKContext
+<ImageKitProvider
   publicKey="your_public_api_key"
   urlEndpoint="https://ik.imagekit.io/your_imagekit_id"
   authenticator={()=>Promise} 
@@ -678,7 +685,7 @@ const onSuccess = (res) => {
       ]
     }}
   />
-</IKContext>;
+</ImageKitProvider>;
 ```
 
 Custom Button Example, using ref
@@ -696,7 +703,7 @@ const onSuccess = (res) => {
   console.log(res);
 };
 
-<IKContext
+<ImageKitProvider
   publicKey="your_public_api_key"
   urlEndpoint="https://ik.imagekit.io/your_imagekit_id"
   authenticator={()=>Promise} 
@@ -719,7 +726,7 @@ const onSuccess = (res) => {
   />
   <h1>Custom Upload Button</h1>
   {reftest && <button className='custom-button-style' onClick={() => reftest.current.click()}>Upload</button>}
-</IKContext>;
+</ImageKitProvider>;
 ```
 
 ## IKCore
@@ -744,12 +751,24 @@ var imageURL = imagekit.url({
 });
 ```
 
+## ImageKitContext
+
+To access options such as `urlEndpoint`, `publicKey`, `ikClient` or `authenticator` in child elements defined within `ImageKitProvider` you can use `ImageKitContext`. For example:
+
+```js
+import { ImageKitContext } from "imagekitio-next"
+
+... 
+const { urlEndpoint, ikClient, authenticator } = useContext(ImageKitContext);
+
+```
+
 ## Error Handling
 
 You can use `ErrorBoundary` to handle errors anywhere in their child component tree. Log those errors or display a fallback UI instead of the crashed component tree. For example:
 
 ```js
-// urlEndpoint should be present in IKImage or parent IKContext component; otherwise, it will throw an error. For example:
+// urlEndpoint should be present in IKImage or parent ImageKitProvider component; otherwise, it will throw an error. For example:
 <ErrorBoundary>
   <IKImage
     path = "/default-image.jpg"
diff --git a/package.json b/package.json
index a2acb1e..fe38667 100755
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "imagekitio-react",
-  "version": "4.2.0",
+  "version": "5.0.0",
   "description": "React SDK for ImageKit.io which implements client-side upload and URL generation for use inside a react application.",
   "scripts": {
     "build:js": "rollup -c",
@@ -84,7 +84,7 @@
     "prop-types": "^15.7.2"
   },
   "peerDependencies": {
-    "react": "^16.13.1 || ^17.0.0 || ^18.0.0",
-    "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0"
+    "react": "^16.13.1 || ^17.0.0 || ^18.0.0 || ^19.0.0",
+    "react-dom": "^16.13.1 || ^17.0.0 || ^18.0.0 || ^19.0.0"
   }
 }
diff --git a/src/components/IKImage/combinedProps.ts b/src/components/IKImage/combinedProps.ts
index d6dd905..5cc5f16 100644
--- a/src/components/IKImage/combinedProps.ts
+++ b/src/components/IKImage/combinedProps.ts
@@ -1,6 +1,6 @@
 import { UrlOptionsPath, UrlOptionsSrc } from "imagekit-javascript/dist/src/interfaces/UrlOptions";
 import { InferProps } from "prop-types";
-import COMMON_PROPS from "../IKContext/props";
+import COMMON_PROPS from "../ImageKitProvider/props";
 import Props from "./props";
 
 const COMBINED_IMAGE_PROP_TYPES = {
diff --git a/src/components/IKImage/index.tsx b/src/components/IKImage/index.tsx
index 769d2ca..02de716 100755
--- a/src/components/IKImage/index.tsx
+++ b/src/components/IKImage/index.tsx
@@ -1,7 +1,7 @@
 import React, { useContext, useEffect, useRef, useState } from 'react';
 import COMBINED_PROP_TYPES, { IKImageProps } from './combinedProps';
 import { fetchEffectiveConnection, getIKElementsUrl, getSrc } from '../../utils/Utility';
-import { ImageKitContext } from '../IKContext';
+import { ImageKitContext } from '../ImageKitProvider';
 import useImageKitComponent from '../ImageKitComponent';
 
 const IKImage = (props: IKImageProps) => {
@@ -91,7 +91,7 @@ const IKImage = (props: IKImageProps) => {
 
   return <img
     alt={props.alt || ""}
-    src={currentUrl ? currentUrl : ''}
+    src={currentUrl ? currentUrl : undefined}
     ref={imageRef}
     {...restProps}
   />;
diff --git a/src/components/IKUpload/index.tsx b/src/components/IKUpload/index.tsx
index 83b11af..85c67ee 100755
--- a/src/components/IKUpload/index.tsx
+++ b/src/components/IKUpload/index.tsx
@@ -1,14 +1,14 @@
 import React, { forwardRef, useContext, useEffect, useState } from 'react';
-import { IKContextBaseProps } from "../IKContext/props";
+import { ImageKitProviderBaseProps } from "../ImageKitProvider/props";
 import { IKUploadProps, OverrideValues } from "./props";
-import { ImageKitContext } from '../IKContext';
+import { ImageKitContext } from '../ImageKitProvider';
 import useImageKitComponent from '../ImageKitComponent';
 
 type IKUploadState = {
   xhr?: XMLHttpRequest;
 };
 
-const IKUpload = forwardRef<HTMLInputElement, IKUploadProps & IKContextBaseProps>((props, ref) => {
+const IKUpload = forwardRef<HTMLInputElement, IKUploadProps & ImageKitProviderBaseProps>((props, ref) => {
   const [state, setState] = useState<IKUploadState>({});
   const contextOptions = useContext(ImageKitContext);
   const { getIKClient } = useImageKitComponent({ ...props });
diff --git a/src/components/IKVideo/combinedProps.ts b/src/components/IKVideo/combinedProps.ts
index 0fc3d4c..eb811a4 100644
--- a/src/components/IKVideo/combinedProps.ts
+++ b/src/components/IKVideo/combinedProps.ts
@@ -1,6 +1,6 @@
 import { UrlOptionsPath, UrlOptionsSrc } from 'imagekit-javascript/dist/src/interfaces/UrlOptions';
 import { InferProps } from 'prop-types';
-import COMMON_PROPS from "../IKContext/props";
+import COMMON_PROPS from "../ImageKitProvider/props";
 import Props from './props';
 
 const COMBINED_IMAGE_PROP_TYPES = {
diff --git a/src/components/IKVideo/index.tsx b/src/components/IKVideo/index.tsx
index 5c856ae..756058c 100644
--- a/src/components/IKVideo/index.tsx
+++ b/src/components/IKVideo/index.tsx
@@ -1,19 +1,19 @@
 import React, { useContext, useEffect, useRef, useState } from 'react';
-import { IKContextBaseProps, IKContextExtractedProps } from "../IKContext/props";
+import { ImageKitProviderBaseProps, ImageKitProviderExtractedProps } from "../ImageKitProvider/props";
 import COMBINED_PROP_TYPES, { IKVideoProps } from './combinedProps';
 import { getSrc } from '../../utils/Utility';
 import useImageKitComponent from '../ImageKitComponent';
-import { ImageKitContext } from '../IKContext';
+import { ImageKitContext } from '../ImageKitProvider';
 
 export type IKVideoState = {
   currentUrl?: string;
-  contextOptions: IKContextExtractedProps;
+  contextOptions: ImageKitProviderExtractedProps;
 };
 
-const IKVideo = (props: IKVideoProps & IKContextBaseProps) => {
+const IKVideo = (props: IKVideoProps & ImageKitProviderBaseProps) => {
   const videoRef = useRef<HTMLVideoElement>(null);
   const [state, setState] = useState<IKVideoState>({
-    currentUrl: '',
+    currentUrl: undefined,
     contextOptions: {}
   });
 
diff --git a/src/components/ImageKitComponent/index.ts b/src/components/ImageKitComponent/index.ts
index 8169977..ddbf39b 100755
--- a/src/components/ImageKitComponent/index.ts
+++ b/src/components/ImageKitComponent/index.ts
@@ -1,9 +1,9 @@
 import React, { useContext } from 'react';
 import ImageKit from 'imagekit-javascript';
-import { IKContextBaseProps } from '../IKContext/props';
-import { ImageKitContext } from '../IKContext';
+import { ImageKitProviderBaseProps } from '../ImageKitProvider/props';
+import { ImageKitContext } from '../ImageKitProvider';
 
- const useImageKitComponent= <T = void>(props: React.PropsWithChildren & IKContextBaseProps & T):{getIKClient:() => ImageKit} => {
+ const useImageKitComponent= <T = void>(props: React.PropsWithChildren & ImageKitProviderBaseProps & T):{getIKClient:() => ImageKit} => {
   const contextOptions = useContext(ImageKitContext);
 
   const getIKClient = (): ImageKit => {
diff --git a/src/components/IKContext/index.tsx b/src/components/ImageKitProvider/index.tsx
similarity index 54%
rename from src/components/IKContext/index.tsx
rename to src/components/ImageKitProvider/index.tsx
index 443c720..362f84e 100755
--- a/src/components/IKContext/index.tsx
+++ b/src/components/ImageKitProvider/index.tsx
@@ -2,32 +2,32 @@
 import React, { createContext } from 'react';
 import { InferProps } from 'prop-types';
 import ImageKit from 'imagekit-javascript';
-import { IKContextProps, IKContextExtractedProps } from "./props";
+import { ImageKitProviderProps, ImageKitProviderExtractedProps } from "./props";
 
 // Create the context
-export const ImageKitContext = createContext<IKContextExtractedProps>({});
+export const ImageKitContext = createContext<ImageKitProviderExtractedProps>({});
 
 /**
- * Provides a container for ImageKit components. Any option set in IKContext will be passed to the children.
+ * Provides a container for ImageKit components. Any option set in ImageKitProvider will be passed to the children.
  *
  * @example
- *<IKContext  publicKey="<public key>" urlEndpoint="url link">
+ *<ImageKitProvider  publicKey="<public key>" urlEndpoint="url link">
  *    <!-- other tags -->
  *    <Image src={link}/>
- *</IKContext>
+ *</ImageKitProvider>
  */
-const IKContext = (props: React.PropsWithChildren<IKContextProps>) => {
+const ImageKitProvider = (props: React.PropsWithChildren<ImageKitProviderProps>) => {
 
-  const extractContextOptions = (mergedOptions: InferProps<IKContextExtractedProps>) => {
-    var result: IKContextExtractedProps = {};
+  const extractContextOptions = (mergedOptions: InferProps<ImageKitProviderExtractedProps>) => {
+    var result: ImageKitProviderExtractedProps = {};
 
-    const propKeys = Object.keys(IKContextExtractedProps);
+    const propKeys = Object.keys(ImageKitProviderExtractedProps);
 
     for (var i = 0; i < propKeys.length; i++) {
       var key = propKeys[i];
-      const value = mergedOptions[key as keyof IKContextExtractedProps];
+      const value = mergedOptions[key as keyof ImageKitProviderExtractedProps];
       if (value) {
-        result[key as keyof IKContextExtractedProps] = value;
+        result[key as keyof ImageKitProviderExtractedProps] = value;
       }
     }
 
@@ -55,4 +55,4 @@ const IKContext = (props: React.PropsWithChildren<IKContextProps>) => {
   );
 }
 
-export default IKContext;
\ No newline at end of file
+export default ImageKitProvider;
\ No newline at end of file
diff --git a/src/components/IKContext/props.ts b/src/components/ImageKitProvider/props.ts
similarity index 53%
rename from src/components/IKContext/props.ts
rename to src/components/ImageKitProvider/props.ts
index e138a6e..5c6e44e 100644
--- a/src/components/IKContext/props.ts
+++ b/src/components/ImageKitProvider/props.ts
@@ -7,23 +7,23 @@ const Props = {
   authenticator: PropTypes.func
 };
 
-export const IKContextProps = {
+export const ImageKitProviderProps = {
   ...Props,
   transformationPosition: PropTypes.oneOf(['path', 'query']),
 };
 
-export const IKContextExtractedProps = {
-  ...IKContextProps,
+export const ImageKitProviderExtractedProps = {
+  ...ImageKitProviderProps,
   ikClient: PropTypes.instanceOf(ImageKit),
 };
 
-export type IKContextProps = InferProps<typeof IKContextProps> & {
+export type ImageKitProviderProps = InferProps<typeof ImageKitProviderProps> & {
   urlEndpoint?: string;
 };
 
-export type IKContextBaseProps = InferProps<typeof Props>;
+export type ImageKitProviderBaseProps = InferProps<typeof Props>;
 
-export type IKContextExtractedProps = InferProps<typeof IKContextExtractedProps> & {
+export type ImageKitProviderExtractedProps = InferProps<typeof ImageKitProviderExtractedProps> & {
   urlEndpoint?: string;
 };
 
diff --git a/src/index.ts b/src/index.ts
index 1416595..6c7218f 100755
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,13 +1,14 @@
 import ImageKit from 'imagekit-javascript';
-import IKContext from './components/IKContext';
+import ImageKitProvider, { ImageKitContext } from "./components/ImageKitProvider";
 import IKImage from './components/IKImage';
 import IKVideo from  './components/IKVideo';
 import IKUpload from './components/IKUpload';
 
 export {
-    IKContext,
+    ImageKitProvider,
     IKImage,
     IKUpload,
     IKVideo,
-    ImageKit as IKCore
+    ImageKit as IKCore,
+    ImageKitContext
 };
diff --git a/src/utils/Utility.ts b/src/utils/Utility.ts
index e8ef133..bf76e4a 100644
--- a/src/utils/Utility.ts
+++ b/src/utils/Utility.ts
@@ -1,6 +1,6 @@
 import ImageKit from "imagekit-javascript";
 import { TransformationPosition, UrlOptions } from "imagekit-javascript/dist/src/interfaces";
-import { IKContextBaseProps, IKContextExtractedProps } from "../components/IKContext/props";
+import { ImageKitProviderBaseProps, ImageKitProviderExtractedProps } from "../components/ImageKitProvider/props";
 import { IKImageProps, IKImageBaseProps } from "../components/IKImage/combinedProps";
 import { IKVideoBaseProps } from "../components/IKVideo/combinedProps";
 
@@ -11,7 +11,7 @@ export type IKImageState = {
   lqipSrc?: string;
   originalSrcLoaded: boolean;
   intersected: boolean;
-  contextOptions: IKContextExtractedProps;
+  contextOptions: ImageKitProviderExtractedProps;
   observe?: IntersectionObserver;
   initialzeState: boolean
 }
@@ -35,8 +35,8 @@ export const areObjectsDifferent = <T>(prevProps: T, newProps: T, propsAffecting
 }
 type GetSrcReturnType = {originalSrc: string; lqipSrc?: string;};
 
-export const getSrc = ({ urlEndpoint, lqip, src, path, transformation, transformationPosition, queryParameters }: IKImageBaseProps & IKVideoBaseProps & IKContextBaseProps,
-  ikClient: ImageKit, contextOptions: IKContextExtractedProps): GetSrcReturnType  => {
+export const getSrc = ({ urlEndpoint, lqip, src, path, transformation, transformationPosition, queryParameters }: IKImageBaseProps & IKVideoBaseProps & ImageKitProviderBaseProps,
+  ikClient: ImageKit, contextOptions: ImageKitProviderExtractedProps): GetSrcReturnType  => {
 
   let options: UrlOptions;
   if (src) {
diff --git a/tests/cypress/integration/IKImage.cy.js b/tests/cypress/integration/IKImage.cy.js
index f0d14df..32d030c 100644
--- a/tests/cypress/integration/IKImage.cy.js
+++ b/tests/cypress/integration/IKImage.cy.js
@@ -5,7 +5,7 @@ describe('ImageKit React SDK', () => {
     it('should have empty src before reaching lazyload threshold', () => {
       cy.visit(APP_HOST);
 
-      cy.get('.lazyload').should('have.attr', 'src').and('equal', '');
+      cy.get(".lazyload").should("not.have.attr", "src");
     });
 
     it('should have actual src after reaching lazyload threshold', () => {
@@ -25,9 +25,7 @@ describe('ImageKit React SDK', () => {
     it('should have lqip src before reaching threshold', () => {
       cy.visit(APP_HOST);
 
-      cy.get('.lazyload-lqip')
-        .should('have.attr', 'src')
-        .and('include', '');
+      cy.get(".lazyload-lqip").should("not.have.attr", "src");
     });
 
     it('should have actual src after reaching element', () => {
@@ -67,7 +65,7 @@ describe('ImageKit React SDK', () => {
   });
 
   describe('State update check', () => {
-    it('should update image src with chained transformation outside IKContext dynamically', () => {
+    it('should update image src with chained transformation outside ImageKitProvider dynamically', () => {
       cy.visit(APP_HOST);
 
       cy.get('.img-transformation-direct').scrollIntoView();
@@ -85,7 +83,7 @@ describe('ImageKit React SDK', () => {
         .should('have.attr', 'src')
         .and('include', 'tr:h-200,w-600,r-max:h-200,w-200,rt-180:ot-TEST,oy-50,ox-100,otc-10C0F0/default-image.jpg');
     });
-    it('should update image src within IKContext when button is clicked', () => {
+    it('should update image src within ImageKitProvider when button is clicked', () => {
       cy.visit(APP_HOST);
 
       cy.get('.img-transformation').scrollIntoView();
diff --git a/tests/jest/IKContext.test.jsx b/tests/jest/IKContext.test.jsx
index b6ad51d..93a41c9 100644
--- a/tests/jest/IKContext.test.jsx
+++ b/tests/jest/IKContext.test.jsx
@@ -2,7 +2,7 @@ import React from 'react'
 import { mount } from 'enzyme';
 import IKImage from '../../src/components/IKImage';
 import IKUpload from '../../src/components/IKUpload';
-import IKContext from '../../src/components/IKContext';
+import ImageKitProvider from '../../src/components/ImageKitProvider';
 
 const authenticationEndpoint = 'test_auth_endpoint';
 const relativePath = 'default-image.jpg';
@@ -16,16 +16,16 @@ const differentUrlEndpoint = 'http://ik.imagekit.io/different_imagekit_id';
 
 const trArr = [{height : 300, width : 300}];
 
-describe('IKContext', () => {
+describe('ImageKitProvider', () => {
   describe('Snapshots', () => {
     test('should work with only urlEndpoint', () => {
       const ikContext = mount(
-        <IKContext urlEndpoint={urlEndpoint} >
+        <ImageKitProvider urlEndpoint={urlEndpoint} >
           <IKImage path={relativePath} transformation={[{
             height: 300,
             width: 400
           }]} />
-        </IKContext>
+        </ImageKitProvider>
       );
       // <img alt="" src="http://ik.imagekit.io/test_imagekit_id/tr:h-300,w-400/default-image.jpg?ik-sdk-version=react-1.x.x">
 
@@ -35,12 +35,12 @@ describe('IKContext', () => {
 
     test('should work with publicKey and urlEndpoint', () => {
       const ikContext = mount(
-        <IKContext publicKey={publicKey} urlEndpoint={urlEndpoint} >
+        <ImageKitProvider publicKey={publicKey} urlEndpoint={urlEndpoint} >
           <IKImage path={relativePath} transformation={[{
             height: 300,
             width: 400
           }]} />
-        </IKContext>
+        </ImageKitProvider>
       );
       // <img alt="" src="http://ik.imagekit.io/test_imagekit_id/tr:h-300,w-400/default-image.jpg?ik-sdk-version=react-1.x.x">
 
@@ -52,9 +52,9 @@ describe('IKContext', () => {
 
     test('should work with publicKey, urlEndpoint and authenticationEndpoint', () => {
       const ikContext = mount(
-        <IKContext publicKey={publicKey} urlEndpoint={urlEndpoint} authenticationEndpoint={authenticationEndpoint} >
+        <ImageKitProvider publicKey={publicKey} urlEndpoint={urlEndpoint} authenticationEndpoint={authenticationEndpoint} >
           <IKUpload onError={() => { }} onSuccess={() => { }} />
-        </IKContext>
+        </ImageKitProvider>
       );
       // '<input type="file">'
       expect(ikContext.html()).toEqual('<input type="file">');
@@ -67,12 +67,12 @@ describe('IKContext', () => {
 
     test('should allow override of own urlEndpoint', () => {
       const ikContext = mount(
-        <IKContext publicKey={publicKey} urlEndpoint={urlEndpoint} >
+        <ImageKitProvider publicKey={publicKey} urlEndpoint={urlEndpoint} >
           <IKImage path={relativePath} urlEndpoint='https://www.custom-domain.com/' transformation={[{
             height: 300,
             width: 400
           }]} />
-        </IKContext>
+        </ImageKitProvider>
       );
       // <img alt="" src="https://www.custom-domain.com/tr:h-300,w-400/default-image.jpg?ik-sdk-version=react-1.x.x">
 
@@ -82,11 +82,11 @@ describe('IKContext', () => {
   });
 
   describe('props update', () => {
-	test('change urlEndpoint in IKContext props and childContext urlEndpoint and image src should change accordingly', () => {
+	test('change urlEndpoint in ImageKitProvider props and childContext urlEndpoint and image src should change accordingly', () => {
 		const ikContext = mount(
-		  <IKContext urlEndpoint={urlEndpoint} >
+		  <ImageKitProvider urlEndpoint={urlEndpoint} >
 			<IKImage path={relativePath} />
-		  </IKContext>
+		  </ImageKitProvider>
 		);
 
 		ikContext.setProps({ urlEndpoint: differentUrlEndpoint });
@@ -99,11 +99,11 @@ describe('IKContext', () => {
 		expect(ikContext.find('img').prop('src')).toEqual(`${differentUrlEndpoint}/${relativePath}`);
 	});
 	
-	test('change path in IKContext props and childContext path and image src should change accordingly', () => {
+	test('change path in ImageKitProvider props and childContext path and image src should change accordingly', () => {
 		const ikContext = mount(
-		  <IKContext urlEndpoint={urlEndpoint} path={relativePath} >
+		  <ImageKitProvider urlEndpoint={urlEndpoint} path={relativePath} >
 			<IKImage />
-		  </IKContext>
+		  </ImageKitProvider>
 		);
 
 		ikContext.setProps({ path: differentImageRelativePath });
@@ -116,11 +116,11 @@ describe('IKContext', () => {
 		expect(ikContext.find('img').prop('src')).toEqual(`${urlEndpoint}/${differentImageRelativePath}`);
 	});
 
-	test('change src in IKContext props and childContext src and image src should change accordingly', () => {
+	test('change src in ImageKitProvider props and childContext src and image src should change accordingly', () => {
 		const ikContext = mount(
-		  <IKContext urlEndpoint={urlEndpoint} src={absolutePath} >
+		  <ImageKitProvider urlEndpoint={urlEndpoint} src={absolutePath} >
 			<IKImage />
-		  </IKContext>
+		  </ImageKitProvider>
 		);
 
 		ikContext.setProps({ src: differentAbsolutePath });
@@ -133,11 +133,11 @@ describe('IKContext', () => {
 		expect(ikContext.find('img').prop('src')).toEqual(`${differentAbsolutePath}`);
 	});
 
-	test('change transformation in IKContext props and childContext transformation and image src should change accordingly', () => {
+	test('change transformation in ImageKitProvider props and childContext transformation and image src should change accordingly', () => {
 		const ikContext = mount(
-		  <IKContext urlEndpoint={urlEndpoint} >
+		  <ImageKitProvider urlEndpoint={urlEndpoint} >
 			<IKImage path={relativePath} />
-		  </IKContext>
+		  </ImageKitProvider>
 		);
 
 		ikContext.setProps({ transformation: trArr });
@@ -150,11 +150,11 @@ describe('IKContext', () => {
 		expect(ikContext.find('img').prop('src')).toEqual(`${urlEndpoint}/tr:h-300,w-300/${relativePath}`);
 	});
 
-	test('change transformationPosition in IKContext props and childContext transformationPosition and image src should change accordingly', () => {
+	test('change transformationPosition in ImageKitProvider props and childContext transformationPosition and image src should change accordingly', () => {
 		const ikContext = mount(
-		  <IKContext urlEndpoint={urlEndpoint} >
+		  <ImageKitProvider urlEndpoint={urlEndpoint} >
 			<IKImage path={relativePath} transformation={trArr} />
-		  </IKContext>
+		  </ImageKitProvider>
 		);
 
 		ikContext.setProps({ transformationPosition: "query" });
@@ -167,11 +167,11 @@ describe('IKContext', () => {
 		expect(ikContext.find('img').prop('src')).toEqual(`${urlEndpoint}/${relativePath}?tr=h-300%2Cw-300`);
 	});
 
-	test('change queryParameters in IKContext props and childContext queryParameters and image src should change accordingly', () => {
+	test('change queryParameters in ImageKitProvider props and childContext queryParameters and image src should change accordingly', () => {
 		const ikContext = mount(
-		  <IKContext urlEndpoint={urlEndpoint} >
+		  <ImageKitProvider urlEndpoint={urlEndpoint} >
 			<IKImage path={relativePath} />
-		  </IKContext>
+		  </ImageKitProvider>
 		);
 
 		ikContext.setProps({ queryParameters: {"v" : "1"} });
diff --git a/tests/jest/IKUpload.test.jsx b/tests/jest/IKUpload.test.jsx
index 641cb02..1faab51 100644
--- a/tests/jest/IKUpload.test.jsx
+++ b/tests/jest/IKUpload.test.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { mount } from 'enzyme';
 import sinon from 'sinon';
 import ImageKitComponent from '../../src/components/ImageKitComponent';
-import IKContext from '../../src/components/IKContext';
+import ImageKitProvider from '../../src/components/ImageKitProvider';
 import IKUpload from '../../src/components/IKUpload';
 
 const publicKey = 'test_public_key';
@@ -119,9 +119,9 @@ describe('IKUpload', () => {
       test('should successfully upload file', () => {
         // mount component
         const ikUpload = mount(
-          <IKContext publicKey={publicKey} urlEndpoint={urlEndpoint} authenticationEndpoint={authenticationEndpoint} >
+          <ImageKitProvider publicKey={publicKey} urlEndpoint={urlEndpoint} authenticationEndpoint={authenticationEndpoint} >
             <IKUpload onError={onError} onSuccess={onSuccess} />
-          </IKContext>
+          </ImageKitProvider>
         );
 
         // verify setup integrity
@@ -144,9 +144,9 @@ describe('IKUpload', () => {
     describe('Failure cases', () => {
       test('should call onError for missing publicKey', () => {
         const ikUpload = mount(
-          <IKContext urlEndpoint={urlEndpoint} authenticationEndpoint={authenticationEndpoint} >
+          <ImageKitProvider urlEndpoint={urlEndpoint} authenticationEndpoint={authenticationEndpoint} >
             <IKUpload onError={onError} onSuccess={onSuccess} />
-          </IKContext>
+          </ImageKitProvider>
         );
         // verify setup integrity
         expect(ikUpload.html()).toEqual('<input type="file">');
@@ -165,9 +165,9 @@ describe('IKUpload', () => {
 
       test('should call onError for missing urlEndpoint', () => {
         const ikUpload = mount(
-          <IKContext publicKey={publicKey} authenticationEndpoint={authenticationEndpoint} >
+          <ImageKitProvider publicKey={publicKey} authenticationEndpoint={authenticationEndpoint} >
             <IKUpload onError={onError} onSuccess={onSuccess} />
-          </IKContext>
+          </ImageKitProvider>
         );
         // verify setup integrity
         expect(ikUpload.html()).toEqual('<input type="file">');
@@ -186,9 +186,9 @@ describe('IKUpload', () => {
 
       test('should call onError for missing authenticationEndpoint', () => {
         const ikUpload = mount(
-          <IKContext publicKey={publicKey} urlEndpoint={urlEndpoint} >
+          <ImageKitProvider publicKey={publicKey} urlEndpoint={urlEndpoint} >
             <IKUpload onError={onError} onSuccess={onSuccess} />
-          </IKContext>
+          </ImageKitProvider>
         );
         // verify setup integrity
         expect(ikUpload.html()).toEqual('<input type="file">');
@@ -207,9 +207,9 @@ describe('IKUpload', () => {
 
       test('should not call upload or onError for missing urlEndpoint and missing onError', () => {
         const ikUpload = mount(
-          <IKContext  authenticationEndpoint={authenticationEndpoint} publicKey={publicKey} >
+          <ImageKitProvider  authenticationEndpoint={authenticationEndpoint} publicKey={publicKey} >
             <IKUpload onSuccess={onSuccess} />
-          </IKContext>
+          </ImageKitProvider>
         );
         // verify setup integrity
         expect(ikUpload.html()).toEqual('<input type="file">');
@@ -225,9 +225,9 @@ describe('IKUpload', () => {
 
       test('should not call upload for missing publickKey and missing onError', () => {
         const ikUpload = mount(
-          <IKContext  authenticationEndpoint={authenticationEndpoint} urlEndpoint={urlEndpoint} >
+          <ImageKitProvider  authenticationEndpoint={authenticationEndpoint} urlEndpoint={urlEndpoint} >
             <IKUpload onSuccess={onSuccess} />
-          </IKContext>
+          </ImageKitProvider>
         );
         // verify setup integrity
         expect(ikUpload.html()).toEqual('<input type="file">');
@@ -243,9 +243,9 @@ describe('IKUpload', () => {
 
       test('should not call upload for missing file', () => {
         const ikUpload = mount(
-          <IKContext publicKey={publicKey} authenticationEndpoint={authenticationEndpoint} urlEndpoint={urlEndpoint} >
+          <ImageKitProvider publicKey={publicKey} authenticationEndpoint={authenticationEndpoint} urlEndpoint={urlEndpoint} >
             <IKUpload onError={onError} onSuccess={onSuccess} />
-          </IKContext>
+          </ImageKitProvider>
         );
         // verify setup integrity
         expect(ikUpload.html()).toEqual('<input type="file">');
@@ -261,9 +261,9 @@ describe('IKUpload', () => {
 
       test('should not call upload for missing authenticationEndpoint and missing onError', () => {
         const ikUpload = mount(
-          <IKContext publicKey={publicKey} urlEndpoint={urlEndpoint} >
+          <ImageKitProvider publicKey={publicKey} urlEndpoint={urlEndpoint} >
             <IKUpload onSuccess={onSuccess} />
-          </IKContext>
+          </ImageKitProvider>
         );
         // verify setup integrity
         expect(ikUpload.html()).toEqual('<input type="file">');
@@ -279,9 +279,9 @@ describe('IKUpload', () => {
 
       test('should not call onError in case server returns error response and missing onError', () => {
         const ikUpload = mount(
-          <IKContext publicKey={publicKey} urlEndpoint={urlEndpoint} authenticationEndpoint={authenticationEndpoint}>
+          <ImageKitProvider publicKey={publicKey} urlEndpoint={urlEndpoint} authenticationEndpoint={authenticationEndpoint}>
             <IKUpload onSuccess={onSuccess} />
-          </IKContext>
+          </ImageKitProvider>
         );
         // verify setup integrity
         expect(ikUpload.html()).toEqual('<input type="file">');
@@ -304,9 +304,9 @@ describe('IKUpload', () => {
 
       test('should not call onSuccess in case server returns error response and missing onSuccess', () => {
         const ikUpload = mount(
-          <IKContext publicKey={publicKey} urlEndpoint={urlEndpoint} authenticationEndpoint={authenticationEndpoint}>
+          <ImageKitProvider publicKey={publicKey} urlEndpoint={urlEndpoint} authenticationEndpoint={authenticationEndpoint}>
             <IKUpload onError={onError} />
-          </IKContext>
+          </ImageKitProvider>
         );
         // verify setup integrity
         expect(ikUpload.html()).toEqual('<input type="file">');
@@ -325,9 +325,9 @@ describe('IKUpload', () => {
 
       test('should call onError in case server returns error response', () => {
         const ikUpload = mount(
-          <IKContext publicKey={publicKey} urlEndpoint={urlEndpoint} authenticationEndpoint={authenticationEndpoint}>
+          <ImageKitProvider publicKey={publicKey} urlEndpoint={urlEndpoint} authenticationEndpoint={authenticationEndpoint}>
             <IKUpload onError={onError} onSuccess={onSuccess} />
-          </IKContext>
+          </ImageKitProvider>
         );
         // verify setup integrity
         expect(ikUpload.html()).toEqual('<input type="file">');
@@ -354,9 +354,9 @@ describe('IKUpload', () => {
       test('should call onChange when file input changes', () => {
         // mount component
         const ikUpload = mount(
-          <IKContext publicKey={publicKey} urlEndpoint={urlEndpoint} authenticationEndpoint={authenticationEndpoint} >
+          <ImageKitProvider publicKey={publicKey} urlEndpoint={urlEndpoint} authenticationEndpoint={authenticationEndpoint} >
             <IKUpload onError={onError} onSuccess={onSuccess} onChange={onChange} />
-          </IKContext>
+          </ImageKitProvider>
         );
         // verify setup integrity
         expect(ikUpload.html()).toEqual('<input type="file">');
@@ -372,9 +372,9 @@ describe('IKUpload', () => {
       test('should call onUploadStart when file input changes', () => {
         // mount component
         const ikUpload = mount(
-          <IKContext publicKey={publicKey} urlEndpoint={urlEndpoint} authenticationEndpoint={authenticationEndpoint} >
+          <ImageKitProvider publicKey={publicKey} urlEndpoint={urlEndpoint} authenticationEndpoint={authenticationEndpoint} >
             <IKUpload onError={onError} onSuccess={onSuccess} onUploadStart={onUploadStart} />
-          </IKContext>
+          </ImageKitProvider>
         );
         // verify setup integrity
         expect(ikUpload.html()).toEqual('<input type="file">');
@@ -391,9 +391,9 @@ describe('IKUpload', () => {
       test('should not upload file if validateFile fails', () => {
         // mount component
         const ikUpload = mount(
-          <IKContext publicKey={publicKey} urlEndpoint={urlEndpoint} authenticationEndpoint={authenticationEndpoint} >
+          <ImageKitProvider publicKey={publicKey} urlEndpoint={urlEndpoint} authenticationEndpoint={authenticationEndpoint} >
             <IKUpload onError={onError} onSuccess={onSuccess} validateFile={() => false} />
-          </IKContext>
+          </ImageKitProvider>
         );
         // verify setup integrity
         expect(ikUpload.html()).toEqual('<input type="file">');
@@ -409,9 +409,9 @@ describe('IKUpload', () => {
       test('should call onUploadProgress during file upload', () => {
         // mount component
         const ikUpload = mount(
-          <IKContext publicKey={publicKey} urlEndpoint={urlEndpoint} authenticationEndpoint={authenticationEndpoint} >
+          <ImageKitProvider publicKey={publicKey} urlEndpoint={urlEndpoint} authenticationEndpoint={authenticationEndpoint} >
             <IKUpload onError={onError} onSuccess={onSuccess} onUploadProgress={onUploadProgress} />
-          </IKContext>
+          </ImageKitProvider>
         );
         // verify setup integrity
         expect(ikUpload.html()).toEqual('<input type="file">');
@@ -435,9 +435,9 @@ describe('IKUpload', () => {
         // mount component
         const ref = React.createRef();
         const ikUpload = mount(
-          <IKContext publicKey={publicKey} urlEndpoint={urlEndpoint} authenticationEndpoint={authenticationEndpoint} >
+          <ImageKitProvider publicKey={publicKey} urlEndpoint={urlEndpoint} authenticationEndpoint={authenticationEndpoint} >
             <IKUpload onError={onError} onSuccess={onSuccess} ref={ref} />
-          </IKContext>
+          </ImageKitProvider>
         );
         // verify setup integrity
         expect(ikUpload.html()).toEqual('<input type="file">');
@@ -451,12 +451,12 @@ describe('IKUpload', () => {
     });
 
 	describe('props update', () => {
-		test('upload with no urlEndpoint should throw error, then after should succed updating urlEndpoint in IKContext with state change', () => {
+		test('upload with no urlEndpoint should throw error, then after should succed updating urlEndpoint in ImageKitProvider with state change', () => {
 			// mount component
 			const ikUpload = mount(
-				<IKContext publicKey={publicKey} authenticationEndpoint={authenticationEndpoint} >
+				<ImageKitProvider publicKey={publicKey} authenticationEndpoint={authenticationEndpoint} >
 					<IKUpload onError={onError} onSuccess={onSuccess} />
-				</IKContext>
+				</ImageKitProvider>
 			);
 
 			// verify setup integrity
@@ -473,10 +473,10 @@ describe('IKUpload', () => {
 			expect(onError.calledOnce).toEqual(true)
 			expect(onError.args[0][0]).toEqual({ message: 'Missing urlEndpoint' });
 			
-			//update urlEndpoint in IKContext
+			//update urlEndpoint in ImageKitProvider
 			ikUpload.setProps({ urlEndpoint });
 			ikUpload.update();
-			//Now after updating urlEndpoint in IKContext, it should successfully upload
+			//Now after updating urlEndpoint in ImageKitProvider, it should successfully upload
 
 			// verify setup integrity
 			expect(ikUpload.html()).toEqual('<input type="file">');
@@ -497,12 +497,12 @@ describe('IKUpload', () => {
 			ikUpload.unmount();
 		});
 
-		test('upload with no publicKey should throw error, then after should succed updating publicKey in IKContext with state change', () => {
+		test('upload with no publicKey should throw error, then after should succed updating publicKey in ImageKitProvider with state change', () => {
 			// mount component
 			const ikUpload = mount(
-				<IKContext urlEndpoint={urlEndpoint} authenticationEndpoint={authenticationEndpoint} >
+				<ImageKitProvider urlEndpoint={urlEndpoint} authenticationEndpoint={authenticationEndpoint} >
 					<IKUpload onError={onError} onSuccess={onSuccess} />
-				</IKContext>
+				</ImageKitProvider>
 			);
 
 			// verify setup integrity
@@ -519,10 +519,10 @@ describe('IKUpload', () => {
 			expect(onError.calledOnce).toEqual(true)
 			expect(onError.args[0][0]).toEqual({ message: 'Missing publicKey' });
 			
-			//update publicKey in IKContext
+			//update publicKey in ImageKitProvider
 			ikUpload.setProps({ publicKey });
 			ikUpload.update();
-			//Now after updating publicKey in IKContext, it should successfully upload
+			//Now after updating publicKey in ImageKitProvider, it should successfully upload
 
 			// verify setup integrity
 			expect(ikUpload.html()).toEqual('<input type="file">');
@@ -543,12 +543,12 @@ describe('IKUpload', () => {
 			ikUpload.unmount();
 		});
 		
-		test('upload with no authenticationEndpoint should throw error, then after should succed updating authenticationEndpoint in IKContext with state change', () => {
+		test('upload with no authenticationEndpoint should throw error, then after should succed updating authenticationEndpoint in ImageKitProvider with state change', () => {
 			// mount component
 			const ikUpload = mount(
-				<IKContext publicKey={publicKey} urlEndpoint={urlEndpoint} >
+				<ImageKitProvider publicKey={publicKey} urlEndpoint={urlEndpoint} >
 					<IKUpload onError={onError} onSuccess={onSuccess} />
-				</IKContext>
+				</ImageKitProvider>
 			);
 
 			// verify setup integrity
@@ -565,10 +565,10 @@ describe('IKUpload', () => {
 			expect(onError.calledOnce).toEqual(true)
 			expect(onError.args[0][0]).toEqual({ message: 'Missing authenticationEndpoint' });
 			
-			//update authenticationEndpoint in IKContext
+			//update authenticationEndpoint in ImageKitProvider
 			ikUpload.setProps({ authenticationEndpoint });
 			ikUpload.update();
-			//Now after updating authenticationEndpoint in IKContext, it should successfully upload
+			//Now after updating authenticationEndpoint in ImageKitProvider, it should successfully upload
 
 			// verify setup integrity
 			expect(ikUpload.html()).toEqual('<input type="file">');
@@ -595,16 +595,16 @@ describe('IKUpload', () => {
   describe('Snapshots', () => {
     test('should render with full auth context and onError and onSuccess props', () => {
       const ikUpload = mount(
-        <IKContext publicKey={publicKey} urlEndpoint={urlEndpoint} authenticationEndpoint={authenticationEndpoint} >
+        <ImageKitProvider publicKey={publicKey} urlEndpoint={urlEndpoint} authenticationEndpoint={authenticationEndpoint} >
           <IKUpload onError={onError} onSuccess={onSuccess} />
-        </IKContext>
+        </ImageKitProvider>
       );
       expect(ikUpload.html()).toEqual('<input type="file">');
     });
 
     test('should render with full auth context and all the props', () => {
       const ikUpload = mount(
-        <IKContext publicKey={publicKey} urlEndpoint={urlEndpoint} authenticationEndpoint={authenticationEndpoint} >
+        <ImageKitProvider publicKey={publicKey} urlEndpoint={urlEndpoint} authenticationEndpoint={authenticationEndpoint} >
           <IKUpload
             useUniqueFileName={false}
             tags={['tag1', 'tag2']}
@@ -615,25 +615,25 @@ describe('IKUpload', () => {
             onError={onError}
             onSuccess={onSuccess}
           />
-        </IKContext>
+        </ImageKitProvider>
       );
       expect(ikUpload.html()).toEqual('<input type="file">');
     });
 
     test('should render with full auth context and without fileName prop', () => {
       const ikUpload = mount(
-        <IKContext publicKey={publicKey} urlEndpoint={urlEndpoint} authenticationEndpoint={authenticationEndpoint} >
+        <ImageKitProvider publicKey={publicKey} urlEndpoint={urlEndpoint} authenticationEndpoint={authenticationEndpoint} >
           <IKUpload useUniqueFileName={true} onError={onError} onSuccess={onSuccess} />
-        </IKContext>
+        </ImageKitProvider>
       );
       expect(ikUpload.html()).toEqual('<input type="file">');
     });
 
     test('should render without authenticationEndpoint in auth context', () => {
       const ikUpload = mount(
-        <IKContext publicKey={publicKey} urlEndpoint={urlEndpoint}>
+        <ImageKitProvider publicKey={publicKey} urlEndpoint={urlEndpoint}>
           <IKUpload />
-        </IKContext>
+        </ImageKitProvider>
       );
       expect(ikUpload.html()).toEqual('<input type="file">');
     });
diff --git a/tests/test-app/src/App.js b/tests/test-app/src/App.js
index 39ac85c..33f7f9f 100755
--- a/tests/test-app/src/App.js
+++ b/tests/test-app/src/App.js
@@ -1,6 +1,6 @@
 import React, { useState, useRef } from 'react';
 import './App.css';
-import { IKImage, IKContext, IKUpload, IKVideo } from 'imagekitio-react'
+import { IKImage, ImageKitProvider, IKUpload, IKVideo } from 'imagekitio-react'
 
 function App() {
   const publicKey = process.env.REACT_APP_PUBLIC_KEY;
@@ -124,8 +124,8 @@ function App() {
       </div>
       <br />
 
-      <p>Using context <code>IKContext</code></p>
-      <IKContext publicKey={publicKey} urlEndpoint={urlEndpoint} authenticator={authenticator}>
+      <p>Using context <code>ImageKitProvider</code></p>
+      <ImageKitProvider publicKey={publicKey} urlEndpoint={urlEndpoint} authenticator={authenticator}>
         <p>Let's add an Image</p>
         <IKImage src={src} />
 
@@ -229,9 +229,9 @@ function App() {
         />
 
         {(error && error.hasOwnProperty('uploadFileErr')) && <p style={{ color: 'red' }} className='upload-error-ik'>{'File upload failed.'}</p>}
-      </IKContext>
+      </ImageKitProvider>
 
-      <IKContext publicKey={publicKey} urlEndpoint={videoUrlEndpoint}>
+      <ImageKitProvider publicKey={publicKey} urlEndpoint={videoUrlEndpoint}>
         <p>Video Element</p>
         <IKVideo
           className='ikvideo-default'
@@ -248,7 +248,7 @@ function App() {
           transformation={[{ height: 200, width: 600, b: '5_red', q: 95 }]}
           controls={true}
         />
-      </IKContext>
+      </ImageKitProvider>
     </div >
   );
 }