diff --git a/Cargo.toml b/Cargo.toml
index f39c2907..ab6c0f3e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -126,7 +126,7 @@ name = "dialogue"
 required-features = ["macros"]
 
 [[example]]
-name = "simple_commands"
+name = "command"
 required-features = ["macros"]
 
 [[example]]
diff --git a/README.md b/README.md
index 73ba1b81..e63cd1ab 100644
--- a/README.md
+++ b/README.md
@@ -84,7 +84,7 @@ tokio = { version =  "1.8", features = ["rt-multi-thread", "macros"] }
 
 This bot replies with a dice throw to each received message:
 
-([Full](examples/dices.rs))
+([Full](examples/throw_dice.rs))
 
 ```rust,no_run
 use teloxide::prelude::*;
@@ -92,7 +92,7 @@ use teloxide::prelude::*;
 #[tokio::main]
 async fn main() {
     pretty_env_logger::init();
-    log::info!("Starting dices_bot...");
+    log::info!("Starting throw dice bot...");
 
     let bot = Bot::from_env().auto_send();
 
@@ -106,7 +106,7 @@ async fn main() {
 
 <div align="center">
   <kbd>
-    <img src=../../raw/master/media/DICES_BOT.gif />
+    <img src=../../raw/master/media/throw-dice.gif />
   </kbd>
 </div>
 
@@ -121,7 +121,7 @@ Commands are strongly typed and defined declaratively, similar to how we define
 [structopt]: https://docs.rs/structopt/0.3.9/structopt/
 [serde-json]: https://github.com/serde-rs/json
 
-([Full](examples/simple_commands.rs))
+([Full](examples/command.rs))
 
 ```rust,no_run
 use teloxide::{prelude::*, utils::command::BotCommands};
@@ -131,7 +131,7 @@ use std::error::Error;
 #[tokio::main]
 async fn main() {
     pretty_env_logger::init();
-    log::info!("Starting simple_commands_bot...");
+    log::info!("Starting command bot...");
 
     let bot = Bot::from_env().auto_send();
 
@@ -176,7 +176,7 @@ async fn answer(
 
 <div align="center">
   <kbd>
-    <img src=../../raw/master/media/SIMPLE_COMMANDS_BOT.gif />
+    <img src=../../raw/master/media/command.gif />
   </kbd>
 </div>
 
@@ -213,7 +213,7 @@ impl Default for State {
 #[tokio::main]
 async fn main() {
     pretty_env_logger::init();
-    log::info!("Starting dialogue_bot...");
+    log::info!("Starting dialogue bot...");
 
     let bot = Bot::from_env().auto_send();
 
@@ -302,7 +302,7 @@ async fn receive_location(
 
 <div align="center">
   <kbd>
-    <img src=../../raw/master/media/DIALOGUE_BOT.gif />
+    <img src=../../raw/master/media/dialogue.gif />
   </kbd>
 </div>
 
diff --git a/examples/admin.rs b/examples/admin.rs
index 93ff78e9..298d62b5 100644
--- a/examples/admin.rs
+++ b/examples/admin.rs
@@ -56,7 +56,7 @@ impl FromStr for UnitOfTime {
 #[tokio::main]
 async fn main() {
     pretty_env_logger::init();
-    log::info!("Starting admin_bot...");
+    log::info!("Starting admin bot...");
 
     let bot = teloxide::Bot::from_env().auto_send();
 
diff --git a/examples/buttons.rs b/examples/buttons.rs
index f68b3b3a..5b16fe35 100644
--- a/examples/buttons.rs
+++ b/examples/buttons.rs
@@ -21,7 +21,7 @@ enum Command {
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn Error>> {
     pretty_env_logger::init();
-    log::info!("Starting bot...");
+    log::info!("Starting buttons bot...");
 
     let bot = Bot::from_env().auto_send();
 
diff --git a/examples/simple_commands.rs b/examples/command.rs
similarity index 96%
rename from examples/simple_commands.rs
rename to examples/command.rs
index 4734b980..5b30240a 100644
--- a/examples/simple_commands.rs
+++ b/examples/command.rs
@@ -5,7 +5,7 @@ use std::error::Error;
 #[tokio::main]
 async fn main() {
     pretty_env_logger::init();
-    log::info!("Starting simple_commands_bot...");
+    log::info!("Starting command bot...");
 
     let bot = Bot::from_env().auto_send();
 
diff --git a/examples/db_remember.rs b/examples/db_remember.rs
index 2aba6dc4..57f3007b 100644
--- a/examples/db_remember.rs
+++ b/examples/db_remember.rs
@@ -38,7 +38,7 @@ pub enum Command {
 #[tokio::main]
 async fn main() {
     pretty_env_logger::init();
-    log::info!("Starting db_remember_bot...");
+    log::info!("Starting DB remember bot...");
 
     let bot = Bot::from_env().auto_send();
 
diff --git a/examples/dialogue.rs b/examples/dialogue.rs
index f0c46a54..1c75e630 100644
--- a/examples/dialogue.rs
+++ b/examples/dialogue.rs
@@ -35,7 +35,7 @@ impl Default for State {
 #[tokio::main]
 async fn main() {
     pretty_env_logger::init();
-    log::info!("Starting dialogue_bot...");
+    log::info!("Starting dialogue bot...");
 
     let bot = Bot::from_env().auto_send();
 
diff --git a/examples/dispatching_features.rs b/examples/dispatching_features.rs
index fb36a96a..91ef0808 100644
--- a/examples/dispatching_features.rs
+++ b/examples/dispatching_features.rs
@@ -12,7 +12,7 @@ use teloxide::{
 #[tokio::main]
 async fn main() {
     pretty_env_logger::init();
-    log::info!("Starting dispatching_features_bot...");
+    log::info!("Starting dispatching features bot...");
 
     let bot = Bot::from_env().auto_send();
 
diff --git a/examples/heroku_ping_pong.rs b/examples/heroku_ping_pong.rs
index 957133d1..6374ed78 100644
--- a/examples/heroku_ping_pong.rs
+++ b/examples/heroku_ping_pong.rs
@@ -39,7 +39,7 @@ use reqwest::{StatusCode, Url};
 #[tokio::main]
 async fn main() {
     pretty_env_logger::init();
-    log::info!("Starting heroku_ping_pong_bot...");
+    log::info!("Starting Heroku ping-pong bot...");
 
     let bot = Bot::from_env().auto_send();
 
diff --git a/examples/inline.rs b/examples/inline.rs
index be8871c5..a85de2c2 100644
--- a/examples/inline.rs
+++ b/examples/inline.rs
@@ -9,7 +9,7 @@ use teloxide::{
 #[tokio::main]
 async fn main() {
     pretty_env_logger::init();
-    log::info!("Starting inline_bot...");
+    log::info!("Starting inline bot...");
 
     let bot = Bot::from_env().auto_send();
 
diff --git a/examples/ngrok_ping_pong.rs b/examples/ngrok_ping_pong.rs
index e93aef2b..f44086c6 100644
--- a/examples/ngrok_ping_pong.rs
+++ b/examples/ngrok_ping_pong.rs
@@ -6,7 +6,7 @@ use teloxide::{dispatching::update_listeners::webhooks, prelude::*};
 #[tokio::main]
 async fn main() {
     pretty_env_logger::init();
-    log::info!("Starting ngrok_ping_pong_bot...");
+    log::info!("Starting ngrok ping-pong bot...");
 
     let bot = Bot::from_env().auto_send();
 
diff --git a/examples/shared_state.rs b/examples/shared_state.rs
index cdc65a13..33f5d4b6 100644
--- a/examples/shared_state.rs
+++ b/examples/shared_state.rs
@@ -10,7 +10,7 @@ static MESSAGES_TOTAL: Lazy<AtomicU64> = Lazy::new(AtomicU64::default);
 #[tokio::main]
 async fn main() {
     pretty_env_logger::init();
-    log::info!("Starting shared_state_bot...");
+    log::info!("Starting shared state bot...");
 
     let bot = Bot::from_env().auto_send();
 
diff --git a/examples/dices.rs b/examples/throw_dice.rs
similarity index 88%
rename from examples/dices.rs
rename to examples/throw_dice.rs
index a91a7ea4..758778b1 100644
--- a/examples/dices.rs
+++ b/examples/throw_dice.rs
@@ -5,7 +5,7 @@ use teloxide::prelude::*;
 #[tokio::main]
 async fn main() {
     pretty_env_logger::init();
-    log::info!("Starting dices_bot...");
+    log::info!("Starting throw dice bot...");
 
     let bot = Bot::from_env().auto_send();
 
diff --git a/media/DIALOGUE_BOT.gif b/media/DIALOGUE_BOT.gif
deleted file mode 100644
index 68e4d0a7..00000000
Binary files a/media/DIALOGUE_BOT.gif and /dev/null differ
diff --git a/media/DICES_BOT.gif b/media/DICES_BOT.gif
deleted file mode 100644
index 341361f1..00000000
Binary files a/media/DICES_BOT.gif and /dev/null differ
diff --git a/media/SIMPLE_COMMANDS_BOT.gif b/media/SIMPLE_COMMANDS_BOT.gif
deleted file mode 100644
index 56c17a7b..00000000
Binary files a/media/SIMPLE_COMMANDS_BOT.gif and /dev/null differ
diff --git a/media/command.gif b/media/command.gif
new file mode 100644
index 00000000..ef2e4a5b
Binary files /dev/null and b/media/command.gif differ
diff --git a/media/dialogue.gif b/media/dialogue.gif
new file mode 100644
index 00000000..dd29622e
Binary files /dev/null and b/media/dialogue.gif differ
diff --git a/media/throw-dice.gif b/media/throw-dice.gif
new file mode 100644
index 00000000..dec2620d
Binary files /dev/null and b/media/throw-dice.gif differ
diff --git a/src/dispatching/mod.rs b/src/dispatching/mod.rs
index 475484ae..ef958901 100644
--- a/src/dispatching/mod.rs
+++ b/src/dispatching/mod.rs
@@ -39,7 +39,7 @@
 //! # #[tokio::main]
 //! # async fn main() {
 //! pretty_env_logger::init();
-//! log::info!("Starting shared_state_bot...");
+//! log::info!("Starting shared state bot...");
 //!
 //! let bot = Bot::from_env().auto_send();
 //!
diff --git a/src/lib.rs b/src/lib.rs
index f5faf538..4c2ba9d8 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -4,14 +4,14 @@
 //!
 //! For a high-level overview, see [our GitHub repository](https://github.com/teloxide/teloxide).
 //!
-//! ([Full](https://github.com/teloxide/teloxide/blob/master/examples/dices.rs))
+//! ([Full](https://github.com/teloxide/teloxide/blob/master/examples/throw_dice.rs))
 //! ```no_run
 //! use teloxide::prelude::*;
 //!
 //! # #[tokio::main]
 //! # async fn main() {
 //! pretty_env_logger::init();
-//! log::info!("Starting dices_bot...");
+//! log::info!("Starting throw dice bot...");
 //!
 //! let bot = Bot::from_env().auto_send();
 //!