diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6ed3888..751a951 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,18 @@ and this project adheres to
 
 ### Changed
 
--
+- Removed the following, in favour of
+  - `http.client.ip` => `client.address`
+  - `http.flavor` => `network.protocol.name`
+  - `http.method` => `http.request.method`
+  - `http.scheme` => `url.scheme`
+  - `http.status_code` => `http.response.status_code`
+  - `http.target` => split in `url.path` and `url.query`
+  - `http.user.agent` => `user_agent.original`
+  - `net.host.name` => `server.address`
+  - `net.host.port` => `server.port`
+  - `net.sock.peer.port` => `network.peer.port`
+  - `net.sock.peer.addr` => `network.peer.address`
 
 ---
 
diff --git a/lib/teleplug.ex b/lib/teleplug.ex
index 0ea41e2..22a5602 100644
--- a/lib/teleplug.ex
+++ b/lib/teleplug.ex
@@ -18,8 +18,6 @@ defmodule Teleplug do
 
   @client_address Atom.to_string(ClientAttributes.client_address())
 
-  @network_protocol_name Atom.to_string(NetworkAttributes.network_protocol_name())
-
   @http_request_method Atom.to_string(HTTPAttributes.http_request_method())
   @http_response_status_code Atom.to_string(HTTPAttributes.http_response_status_code())
   @http_route Atom.to_string(HTTPAttributes.http_route())
@@ -35,6 +33,7 @@ defmodule Teleplug do
 
   @network_peer_address Atom.to_string(NetworkAttributes.network_peer_address())
   @network_peer_port Atom.to_string(NetworkAttributes.network_peer_port())
+  @network_protocol_name Atom.to_string(NetworkAttributes.network_protocol_name())
 
   @behaviour Plug