diff --git a/crates/bevy_openxr/src/openxr/graphics.rs b/crates/bevy_openxr/src/openxr/graphics.rs
index ad3a328..3d152ce 100644
--- a/crates/bevy_openxr/src/openxr/graphics.rs
+++ b/crates/bevy_openxr/src/openxr/graphics.rs
@@ -125,7 +125,7 @@ impl<T: GraphicsType> GraphicsWrap<T> {
 /// # Example
 ///
 /// ```
-/// pub struct OxrFrameStream(GraphicsWrap<XrFrameStream>);
+/// pub struct OxrFrameStream(GraphicsWrap<OxrFrameStream>);
 ///
 /// impl GraphicsType for OxrFrameStream {
 ///     // Here is the inner type
diff --git a/crates/bevy_openxr/src/openxr/init.rs b/crates/bevy_openxr/src/openxr/init.rs
index fe9af01..41e64ea 100644
--- a/crates/bevy_openxr/src/openxr/init.rs
+++ b/crates/bevy_openxr/src/openxr/init.rs
@@ -418,7 +418,7 @@ fn init_xr_session(
 
 /// This is used solely to transport resources from the main world to the render world.
 #[derive(Resource)]
-struct XrRenderResources {
+struct OxrRenderResources {
     session: OxrSession,
     frame_stream: OxrFrameStream,
     swapchain: OxrSwapchain,
@@ -446,7 +446,7 @@ pub fn create_xr_session(
             commands.insert_resource(images.clone());
             commands.insert_resource(graphics_info.clone());
             commands.insert_resource(stage.clone());
-            commands.insert_resource(XrRenderResources {
+            commands.insert_resource(OxrRenderResources {
                 session,
                 frame_stream,
                 swapchain,
@@ -475,7 +475,7 @@ pub fn end_xr_session(session: Res<OxrSession>, session_started: Res<OxrSessionS
 
 /// This system transfers important render resources from the main world to the render world when a session is created.
 pub fn transfer_xr_resources(mut commands: Commands, mut world: ResMut<MainWorld>) {
-    let Some(XrRenderResources {
+    let Some(OxrRenderResources {
         session,
         frame_stream,
         swapchain,
diff --git a/crates/bevy_openxr/src/openxr/mod.rs b/crates/bevy_openxr/src/openxr/mod.rs
index edf8545..6143c37 100644
--- a/crates/bevy_openxr/src/openxr/mod.rs
+++ b/crates/bevy_openxr/src/openxr/mod.rs
@@ -8,7 +8,7 @@ use bevy::{
 use bevy_xr::camera::XrCameraPlugin;
 use bevy_xr::session::XrSessionPlugin;
 use init::OxrInitPlugin;
-use render::XrRenderPlugin;
+use render::OxrRenderPlugin;
 
 pub mod error;
 mod exts;
@@ -34,7 +34,7 @@ pub fn add_xr_plugins<G: PluginGroup>(plugins: G) -> PluginGroupBuilder {
             resolutions: default(),
             synchronous_pipeline_compilation: default(),
         })
-        .add(XrRenderPlugin)
+        .add(OxrRenderPlugin)
         .add(XrCameraPlugin)
         // .add(XrActionPlugin)
         .set(WindowPlugin {
diff --git a/crates/bevy_openxr/src/openxr/render.rs b/crates/bevy_openxr/src/openxr/render.rs
index ec9978e..6c060b8 100644
--- a/crates/bevy_openxr/src/openxr/render.rs
+++ b/crates/bevy_openxr/src/openxr/render.rs
@@ -16,9 +16,9 @@ use crate::init::{session_started, OxrPreUpdateSet};
 use crate::layer_builder::*;
 use crate::resources::*;
 
-pub struct XrRenderPlugin;
+pub struct OxrRenderPlugin;
 
-impl Plugin for XrRenderPlugin {
+impl Plugin for OxrRenderPlugin {
     fn build(&self, app: &mut App) {
         app.add_plugins((ExtractResourcePlugin::<OxrViews>::default(),))
             .add_systems(