diff --git a/proto/sgx/app.proto b/proto/sgx/app.proto
index 5a670f4..d2e863f 100644
--- a/proto/sgx/app.proto
+++ b/proto/sgx/app.proto
@@ -83,7 +83,7 @@ message AppNodeListResp {
   string region = 4;
   string city = 5;
   string ip = 6; // required for latency test
-  uint64 price = 7; // nanoLP per unit per minute
+  uint64 price = 7; // nanocredits per unit per minute
   repeated string reports = 8; // TODO: this will become an enum
 }
 
@@ -143,4 +143,4 @@ service BrainAppDaemon {
   rpc RegisterAppNode (RegisterAppNodeReq) returns (stream DelAppReq);
   rpc BrainMessages (DaemonAuth) returns (stream BrainMessageApp);
   rpc DaemonMessages (stream DaemonMessageApp) returns (common_proto.Empty);
-}
\ No newline at end of file
+}
diff --git a/proto/shared/general.proto b/proto/shared/general.proto
index 8bc0153..93a94c5 100644
--- a/proto/shared/general.proto
+++ b/proto/shared/general.proto
@@ -47,7 +47,7 @@ message KickReq {
 }
 
 message KickResp {
-  uint64 nano_lp = 1;
+  uint64 nano_credits = 1;
 }
 
 message BanUserReq {
@@ -90,4 +90,4 @@ service BrainGeneralCli {
       returns (stream vm_proto.VmContract);
   rpc ListAllAppContracts (common_proto.Empty)
       returns (stream app_proto.AppContract);
-}
\ No newline at end of file
+}
diff --git a/proto/snp/vm.proto b/proto/snp/vm.proto
index 7531e82..8cbbb3d 100644
--- a/proto/snp/vm.proto
+++ b/proto/snp/vm.proto
@@ -22,7 +22,7 @@ message VmContract {
   string dtrfs_sha = 14;
   string created_at = 15;
   string updated_at = 16;
-  // total nanoLP cost per minute (for all units)
+  // total nanocredits cost per minute (for all units)
   uint64 nano_per_minute = 17;
   uint64 locked_nano = 18;
   string collected_at = 19;
@@ -54,7 +54,7 @@ message RegisterVmNodeReq {
   string country = 4;
   string region = 5;
   string city = 6;
-  // nanoLP per unit per minute
+  // nanocredits per unit per minute
   uint64 price = 7;
 }
 
@@ -64,8 +64,8 @@ message VmNodeResources {
   uint32 avail_ipv4 = 3;
   uint32 avail_ipv6 = 4;
   uint32 avail_vcpus = 5;
-  uint32 avail_memory_mb = 6;
-  uint32 avail_storage_gb = 7;
+  uint32 avail_memory_mib = 6;
+  uint32 avail_storage_mib = 7;
   uint32 max_ports_per_vm = 8;
 }
 
@@ -77,9 +77,9 @@ message NewVmReq {
   repeated uint32 extra_ports = 5;
   bool public_ipv4 = 6;
   bool public_ipv6 = 7;
-  uint32 disk_size_gb = 8;
+  uint32 disk_size_mib = 8;
   uint32 vcpus = 9;
-  uint32 memory_mb = 10;
+  uint32 memory_mib = 10;
   string kernel_url = 11;
   string kernel_sha = 12;
   string dtrfs_url = 13;
@@ -98,9 +98,9 @@ message UpdateVmReq {
   string uuid = 1;
   string hostname = 2;
   string admin_pubkey = 3;
-  uint32 disk_size_gb = 4;
+  uint32 disk_size_mib = 4;
   uint32 vcpus = 5;
-  uint32 memory_mb = 6;
+  uint32 memory_mib = 6;
   string kernel_url = 7;
   string kernel_sha = 8;
   string dtrfs_url = 9;
@@ -159,8 +159,8 @@ message VmNodeFilters {
   bool offers_ipv4 = 2;
   bool offers_ipv6 = 3;
   uint32 vcpus = 4;
-  uint32 memory_mb = 5;
-  uint32 storage_gb = 6;
+  uint32 memory_mib = 5;
+  uint32 storage_mib = 6;
   string country = 7;
   string region = 8;
   string city = 9;
@@ -176,7 +176,12 @@ message VmNodeListResp {
   string city = 5;
   string ip = 6; // required for latency test
   repeated string reports = 7; // TODO: this will become an enum
-  uint64 price = 8; // nanoLP per unit per minute
+  uint64 price = 8; // nanocredits per unit per minute
+  uint64 vcpus = 9;
+  uint64 memory_mib = 10;
+  uint64 disk_mib = 11;
+  bool public_ipv4 = 12;
+  bool public_ipv6 = 13;
 }
 
 message ExtendVmReq {