diff --git a/template/.ink/abi_gen/Cargo.toml b/template/.ink/abi_gen/Cargo.toml
index 3bb926ea9a3b333ba521a9083385e61a40e07aa3..acdd1ca116fdab6cf61e8fc8baa47bf1587bbee4 100644
--- a/template/.ink/abi_gen/Cargo.toml
+++ b/template/.ink/abi_gen/Cargo.toml
@@ -11,6 +11,6 @@ path = "main.rs"
 
 [dependencies]
 contract = { path = "../..", package = "{{name}}", default-features = false, features = ["ink-generate-abi"] }
-ink_lang2 = { git = "https://github.com/paritytech/ink", package = "ink_lang2", default-features = false, features = ["ink-generate-abi"] }
+ink_lang = { git = "https://github.com/paritytech/ink", package = "ink_lang", default-features = false, features = ["ink-generate-abi"] }
 serde = "1.0"
 serde_json = "1.0"
diff --git a/template/Cargo.toml b/template/Cargo.toml
index aa74acedeccbeba2a143c2edbb529f6638d12515..8bb06c94dd0c86eac48556d950a3b87b8850d0d0 100644
--- a/template/Cargo.toml
+++ b/template/Cargo.toml
@@ -6,8 +6,9 @@ edition = "2018"
 
 [dependencies]
 ink_abi = { git = "https://github.com/paritytech/ink", package = "ink_abi", default-features = false, features = ["derive"], optional = true }
+ink_primitives = { git = "https://github.com/paritytech/ink", package = "ink_primitives", default-features = false }
 ink_core = { git = "https://github.com/paritytech/ink", package = "ink_core", default-features = false }
-ink_lang2 = { git = "https://github.com/paritytech/ink", package = "ink_lang2", default-features = false }
+ink_lang = { git = "https://github.com/paritytech/ink", package = "ink_lang", default-features = false }
 
 scale = { package = "parity-scale-codec", version = "1.1", default-features = false, features = ["derive"] }
 type-metadata = { git = "https://github.com/type-metadata/type-metadata.git", default-features = false, features = ["derive"], optional = true }
@@ -27,20 +28,20 @@ default = ["test-env"]
 std = [
     "ink_abi/std",
     "ink_core/std",
+    "ink_primitives/std",
     "scale/std",
     "type-metadata/std",
 ]
 test-env = [
     "std",
-    "ink_core/test-env",
-    "ink_lang2/test-env",
+    "ink_lang/test-env",
 ]
 ink-generate-abi = [
     "std",
     "ink_abi",
     "type-metadata",
     "ink_core/ink-generate-abi",
-    "ink_lang2/ink-generate-abi",
+    "ink_lang/ink-generate-abi",
 ]
 ink-as-dependency = []
 
diff --git a/template/lib.rs b/template/lib.rs
index 9d5cc4fb7c716c4b13b6660d2af17fc15a763fc0..91295a3205bcb7233def6f9b79d9f1861a638148 100644
--- a/template/lib.rs
+++ b/template/lib.rs
@@ -1,11 +1,11 @@
-#![feature(proc_macro_hygiene)]
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use ink_core::storage;
-use ink_lang2 as ink;
+use ink_lang as ink;
 
 #[ink::contract(version = "0.1.0")]
 mod {{name}} {
+    use ink_core::storage;
+
     /// Defines the storage of your contract.
     /// Add new fields to the below struct in order
     /// to add new static storage fields to your contract.