diff --git a/crates/codec/src/api/builder/app_builder.rs b/crates/codec/src/api/builder/app_builder.rs
index abde6b44a..60f4919b4 100644
--- a/crates/codec/src/api/builder/app_builder.rs
+++ b/crates/codec/src/api/builder/app_builder.rs
@@ -1,4 +1,4 @@
-use svm_types::{App, SpawnApp, TemplateAddr};
+use svm_types::{Account, SpawnApp, TemplateAddr};
 
 use crate::app;
 
@@ -18,12 +18,12 @@ pub struct SpawnAppBuilder {
 /// ```rust
 /// use std::io::Cursor;
 ///
-/// use svm_types::{App, SpawnApp, Address};
+/// use svm_types::{Account, SpawnApp, Address};
 /// use svm_codec::api::builder::SpawnAppBuilder;
 /// use svm_codec::app;
 ///
 /// let template_addr = Address::of("@template").into();
-/// let name = "My App".to_string();
+/// let name = "My Account".to_string();
 /// let ctor_name = "initialize";
 /// let calldata = vec![0x10, 0x20, 0x30];
 ///
@@ -39,7 +39,7 @@ pub struct SpawnAppBuilder {
 /// let actual = app::decode(&mut cursor).unwrap();
 /// let expected = SpawnApp {
 ///                  version: 0,
-///                  app: App { name, template_addr },
+///                  app: Account { name, template_addr },
 ///                  ctor_name: ctor_name.to_string(),
 ///                  calldata,
 ///                };
@@ -98,7 +98,7 @@ impl SpawnAppBuilder {
 
         let spawn = SpawnApp {
             version,
-            app: App::new(template_addr, name),
+            app: Account::new(template_addr, name),
             ctor_name,
             calldata,
         };
diff --git a/crates/codec/src/api/json/spawn_app.rs b/crates/codec/src/api/json/spawn_app.rs
index 9d506ea7f..c3f94a4fb 100644
--- a/crates/codec/src/api/json/spawn_app.rs
+++ b/crates/codec/src/api/json/spawn_app.rs
@@ -1,6 +1,6 @@
 use std::io::Cursor;
 
-use svm_types::{App, SpawnApp};
+use svm_types::{Account, SpawnApp};
 
 use serde_json::{json, Value};
 
@@ -29,7 +29,7 @@ pub fn encode_spawn_app(json: &Value) -> Result<Vec<u8>, JsonError> {
 
     let spawn = SpawnApp {
         version,
-        app: App::new(template, name),
+        app: Account::new(template, name),
         ctor_name,
         calldata,
     };
diff --git a/crates/codec/src/app.rs b/crates/codec/src/app.rs
index 84e0b6f75..0515f11d1 100644
--- a/crates/codec/src/app.rs
+++ b/crates/codec/src/app.rs
@@ -15,7 +15,7 @@
 
 use std::io::Cursor;
 
-use svm_types::{App, SpawnApp, TemplateAddr};
+use svm_types::{Account, SpawnApp, TemplateAddr};
 
 use crate::{calldata, version};
 use crate::{Field, ParseError, ReadExt, WriteExt};
@@ -39,7 +39,7 @@ pub fn decode(cursor: &mut Cursor<&[u8]>) -> Result<SpawnApp, ParseError> {
     let ctor_name = decode_ctor(cursor)?;
     let calldata = decode_ctor_calldata(cursor)?;
 
-    let app = App {
+    let app = Account {
         name,
         template_addr,
     };
@@ -130,7 +130,7 @@ mod tests {
     fn encode_decode_spawn_app() {
         let spawn = SpawnApp {
             version: 0,
-            app: App {
+            app: Account {
                 name: "my-app".to_string(),
                 template_addr: Address::of("my-template").into(),
             },
diff --git a/crates/runtime/src/env/default/serialize.rs b/crates/runtime/src/env/default/serialize.rs
index 8b30f40e0..850a7139a 100644
--- a/crates/runtime/src/env/default/serialize.rs
+++ b/crates/runtime/src/env/default/serialize.rs
@@ -4,7 +4,7 @@ use std::io::Cursor;
 use svm_codec::{ReadExt, WriteExt};
 
 use svm_codec::template;
-use svm_types::{App, SectionKind, SpawnerAddr, Template, TemplateAddr};
+use svm_types::{Account, SectionKind, SpawnerAddr, Template, TemplateAddr};
 
 use crate::env::{self, traits};
 
@@ -66,7 +66,7 @@ impl AppDeserializer for DefaultAppDeserializer {
             _ => return None,
         };
 
-        let base = App::new(template, name);
+        let base = Account::new(template, name);
         let app = ExtApp::new(&base, &spawner);
 
         Some(app)
diff --git a/crates/runtime/src/env/ext.rs b/crates/runtime/src/env/ext.rs
index 166b91d04..ae0dd61dc 100644
--- a/crates/runtime/src/env/ext.rs
+++ b/crates/runtime/src/env/ext.rs
@@ -1,20 +1,20 @@
-use svm_types::{App, SpawnApp, SpawnerAddr, TemplateAddr};
+use svm_types::{Account, SpawnApp, SpawnerAddr, TemplateAddr};
 
 pub struct ExtApp {
-    base: App,
+    base: Account,
 
     spawner: SpawnerAddr,
 }
 
 impl ExtApp {
-    pub fn new(base: &App, spawner: &SpawnerAddr) -> Self {
+    pub fn new(base: &Account, spawner: &SpawnerAddr) -> Self {
         Self {
             base: base.clone(),
             spawner: spawner.clone(),
         }
     }
 
-    pub fn base(&self) -> &App {
+    pub fn base(&self) -> &Account {
         &self.base
     }
 
@@ -49,7 +49,7 @@ impl ExtSpawnApp {
         &self.base
     }
 
-    pub fn app(&self) -> &App {
+    pub fn app(&self) -> &Account {
         self.base.app()
     }
 
diff --git a/crates/types/src/app.rs b/crates/types/src/account.rs
similarity index 77%
rename from crates/types/src/app.rs
rename to crates/types/src/account.rs
index 8734c908d..f761faefc 100644
--- a/crates/types/src/app.rs
+++ b/crates/types/src/account.rs
@@ -4,16 +4,16 @@ use crate::TemplateAddr;
 
 /// An in-memory representation of an app.
 #[derive(PartialEq, Clone)]
-pub struct App {
-    /// `App`'s name
+pub struct Account {
+    /// [`Account`]'s name
     pub name: String,
 
-    /// `Address` of the `Template`, the App is being spawned from.
+    /// Address of the `Template`, the [`Account`] is being spawned from.
     pub template_addr: TemplateAddr,
 }
 
 #[doc(hidden)]
-impl App {
+impl Account {
     pub fn new(template_addr: TemplateAddr, name: String) -> Self {
         Self {
             name,
@@ -30,9 +30,9 @@ impl App {
     }
 }
 
-impl fmt::Debug for App {
+impl fmt::Debug for Account {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.debug_struct("App")
+        f.debug_struct("Account")
             .field("name", &self.name())
             .field("template", self.template_addr().inner())
             .finish()
diff --git a/crates/types/src/lib.rs b/crates/types/src/lib.rs
index 1d532b194..81281caba 100644
--- a/crates/types/src/lib.rs
+++ b/crates/types/src/lib.rs
@@ -12,9 +12,9 @@
 #[macro_use]
 mod macros;
 
+mod account;
 mod address;
 mod address_of;
-mod app;
 mod error;
 mod spawn_app;
 mod state;
@@ -42,7 +42,7 @@ pub use receipt::{
 pub use address::{Address, AppAddr, DeployerAddr, SpawnerAddr, TemplateAddr};
 pub use address_of::AddressOf;
 
-pub use app::App;
+pub use account::Account;
 pub use spawn_app::SpawnApp;
 pub use state::State;
 pub use template::{
diff --git a/crates/types/src/spawn_app.rs b/crates/types/src/spawn_app.rs
index b41c18dbd..1b4a0e57a 100644
--- a/crates/types/src/spawn_app.rs
+++ b/crates/types/src/spawn_app.rs
@@ -1,15 +1,15 @@
 use std::fmt;
 
-use crate::{App, TemplateAddr};
+use crate::{Account, TemplateAddr};
 
-/// Struct representation of the parsed raw Spawn-App.
+/// Struct representation of the parsed raw Spawn-Account.
 #[derive(PartialEq)]
 pub struct SpawnApp {
     /// Transaction format version
     pub version: u16,
 
     /// Holds all `SpawnApp` non-ctor_name related data.
-    pub app: App,
+    pub app: Account,
 
     /// ctor function name
     pub ctor_name: String,
@@ -20,7 +20,7 @@ pub struct SpawnApp {
 
 #[doc(hidden)]
 impl SpawnApp {
-    pub fn app(&self) -> &App {
+    pub fn app(&self) -> &Account {
         &self.app
     }