diff --git a/protocol-spec/account-login-by-username.md b/CPEs/proposed/CPE2 - In-band account login.md
similarity index 98%
rename from protocol-spec/account-login-by-username.md
rename to CPEs/proposed/CPE2 - In-band account login.md
index 8457600..4f110fb 100644
--- a/protocol-spec/account-login-by-username.md
+++ b/CPEs/proposed/CPE2 - In-band account login.md	
@@ -1,4 +1,4 @@
-# Account login by username
+# CPE#2 - In-band account login
 
 ## Introduction
 
diff --git a/protocol-spec/account-registration.md b/CPEs/proposed/CPE3 - In-band account registration.md
similarity index 98%
rename from protocol-spec/account-registration.md
rename to CPEs/proposed/CPE3 - In-band account registration.md
index 3ef0e63..a7848b5 100644
--- a/protocol-spec/account-registration.md
+++ b/CPEs/proposed/CPE3 - In-band account registration.md	
@@ -1,4 +1,4 @@
-# Account registration
+# CPE#3 - In-band account registration
 
 ## Introduction
 
diff --git a/protocol-spec/basic-chats.md b/CPEs/proposed/CPE4 - Basic chats.md
similarity index 99%
rename from protocol-spec/basic-chats.md
rename to CPEs/proposed/CPE4 - Basic chats.md
index 6956659..77de7dd 100644
--- a/protocol-spec/basic-chats.md
+++ b/CPEs/proposed/CPE4 - Basic chats.md	
@@ -1,9 +1,11 @@
-# Basic chats
+# CPE#4 - Basic chats
 
 ## 1. Introduction
 
 This extension is intended for organizing chats between some entities.
 
+`// TODO describe about events`
+
 ## 2. Requirements
 
 - Exchanging text messages
diff --git a/protocol-spec/basic-request-ratelimit.md b/protocol-spec/basic-request-ratelimit.md
index ac420a8..6a102ec 100644
--- a/protocol-spec/basic-request-ratelimit.md
+++ b/protocol-spec/basic-request-ratelimit.md
@@ -2,7 +2,7 @@
 
 ## Introduction
 
-This extension is intended to limit the number of requests from clients per unit of time. It is based on Protocol Errors extension.
+This core extension is intended to limit the number of requests from clients per unit of time.
 
 ## Message type identifiers