diff --git a/substrate/node-template/runtime/Cargo.toml b/substrate/node-template/runtime/Cargo.toml
index 7e7c76e1ba6c4f0bae80ed689fc3cb29f91ade44..24f9b513f09ec51911e55490d1cfda480da145a7 100644
--- a/substrate/node-template/runtime/Cargo.toml
+++ b/substrate/node-template/runtime/Cargo.toml
@@ -13,7 +13,7 @@ parity-codec-derive = { version = "3.0", default-features = false }
 rstd = { package = "sr-std", path = "../../core/sr-std", default_features = false }
 runtime-io = { package = "sr-io", path = "../../core/sr-io", default_features = false }
 version = { package = "sr-version", path = "../../core/sr-version", default_features = false }
-support = { package = "srml-support", path = "../../srml/support", default_features = false }
+srml-support = { path = "../../srml/support", default_features = false }
 primitives = { package = "substrate-primitives", path = "../../core/primitives", default_features = false }
 balances = { package = "srml-balances", path = "../../srml/balances", default_features = false }
 consensus = { package = "srml-consensus", path = "../../srml/consensus", default_features = false }
@@ -36,7 +36,7 @@ std = [
 	"substrate-client/std",
 	"rstd/std",
 	"runtime-io/std",
-	"support/std",
+	"srml-support/std",
 	"balances/std",
 	"executive/std",
 	"aura/std",
diff --git a/substrate/node-template/runtime/src/lib.rs b/substrate/node-template/runtime/src/lib.rs
index e99b160360659d693cca80252f4a8fa12b23ae64..2cdf37fdbc06ee48d9b65c89fc83ca597b153f8f 100644
--- a/substrate/node-template/runtime/src/lib.rs
+++ b/substrate/node-template/runtime/src/lib.rs
@@ -38,7 +38,7 @@ pub use timestamp::Call as TimestampCall;
 pub use balances::Call as BalancesCall;
 pub use runtime_primitives::{Permill, Perbill};
 pub use timestamp::BlockPeriod;
-pub use support::{StorageValue, construct_runtime};
+pub use srml_support::{StorageValue, construct_runtime};
 
 /// Alias to Ed25519 pubkey that identifies an account on the chain.
 pub type AccountId = primitives::H256;
diff --git a/substrate/srml/support/src/dispatch.rs b/substrate/srml/support/src/dispatch.rs
index 044bd48b7e1cff5f7f0d602153db6d314b6d551a..8e5cc44092b35232fdaffab71aa2e9d74bc23f6e 100644
--- a/substrate/srml/support/src/dispatch.rs
+++ b/substrate/srml/support/src/dispatch.rs
@@ -732,7 +732,7 @@ macro_rules! decl_module {
 				d.dispatch(origin)
 			}
 		}
-		__dispatch_impl_metadata! {
+		$crate::__dispatch_impl_metadata! {
 			$mod_type $trait_instance $trait_name $call_type $origin_type
 			{$( $(#[doc = $doc_attr])* fn $fn_name($from $(, $(#[$codec_attr])* $param_name : $param )*); )*}
 		}
diff --git a/substrate/srml/support/src/event.rs b/substrate/srml/support/src/event.rs
index 3be7572fe0731b6c682aa82e243b1cb039289640..c97bbbb8bf900604c640837cc34943f43b11665b 100644
--- a/substrate/srml/support/src/event.rs
+++ b/substrate/srml/support/src/event.rs
@@ -147,7 +147,7 @@ macro_rules! __decl_generic_event {
 			$(, $( $rest_gen_rename:ident = )* <$rest_gen:ident as $rest_trait:path>::$rest_trait_type:ident )*;
 		Events { $( $events:tt )* };
 	) => {
-		__decl_generic_event!(
+		$crate::__decl_generic_event!(
 			$( #[ $attr ] )*;
 			$event_generic_param;
 			$( $( $rest_gen_rename = )* <$rest_gen as $rest_trait>::$rest_trait_type ),*;
@@ -165,7 +165,7 @@ macro_rules! __decl_generic_event {
 		$( $parsed_generic_params:ident ),*;
 		$( <$parsed_generic:ident as $parsed_trait:path>::$parsed_trait_type:ident ),*;
 	) => {
-		__decl_generic_event!(
+		$crate::__decl_generic_event!(
 			$( #[ $attr ] )*;
 			$event_generic_param;
 			$( $( $rest_gen_rename = )* <$rest_gen as $rest_trait>::$rest_trait_type ),*;
@@ -181,7 +181,7 @@ macro_rules! __decl_generic_event {
 			$(, $( $rest_gen_rename:ident = )* <$rest_gen:ident as $rest_trait:path>::$rest_trait_type:ident )*;
 		Events { $( $events:tt )* };
 	) => {
-		__decl_generic_event!(
+		$crate::__decl_generic_event!(
 			$( #[ $attr ] )*;
 			$event_generic_param;
 			$( $( $rest_gen_rename = )* <$rest_gen as $rest_trait>::$rest_trait_type ),*;
@@ -199,7 +199,7 @@ macro_rules! __decl_generic_event {
 		$( $parsed_generic_params:ident ),*;
 		$( <$parsed_generic:ident as $parsed_trait:path>::$parsed_trait_type:ident ),*;
 	) => {
-		__decl_generic_event!(
+		$crate::__decl_generic_event!(
 			$( #[ $attr ] )*;
 			$event_generic_param;
 			$( $( $rest_gen_rename = )* <$rest_gen as $rest_trait>::$rest_trait_type ),*;
@@ -247,7 +247,7 @@ macro_rules! __events_to_metadata {
 		$event:ident $( ( $( $param:path ),* ) )*,
 		$( $rest:tt )*
 	) => {
-		__events_to_metadata!(
+		$crate::__events_to_metadata!(
 			$( $metadata, )*
 			$crate::event::EventMetadata {
 				name: $crate::event::DecodeDifferent::Encode(stringify!($event)),