5 files changed, 14 insertions, 8 deletions
diff --git a/lib/WebService/TFL/Bus/Response/BaseVersion.pm b/lib/WebService/TFL/Bus/Response/BaseVersion.pm
index 37b2ddb..07edbcb 100644
--- a/lib/WebService/TFL/Bus/Response/BaseVersion.pm
+++ b/lib/WebService/TFL/Bus/Response/BaseVersion.pm
@@ -1,5 +1,5 @@
 package WebService::TFL::Bus::Response::BaseVersion;
-use Moose;
+use Moo;
 use namespace::autoclean;
 
 has Version => (
diff --git a/lib/WebService/TFL/Bus/Response/FlexibleMessage.pm b/lib/WebService/TFL/Bus/Response/FlexibleMessage.pm
index 11b7b1a..603ef6b 100644
--- a/lib/WebService/TFL/Bus/Response/FlexibleMessage.pm
+++ b/lib/WebService/TFL/Bus/Response/FlexibleMessage.pm
@@ -1,5 +1,7 @@
 package WebService::TFL::Bus::Response::FlexibleMessage;
-use Moose;
-with 'WebService::TFL::Bus::ResponseTypeRole' => { type => 'flexible' };
+use Moo;
+use namespace::autoclean;
+use WebService::TFL::Bus::ResponseTypeRole;
+with ResponseTypeRole('flexible');
 
 1;
diff --git a/lib/WebService/TFL/Bus/Response/Prediction.pm b/lib/WebService/TFL/Bus/Response/Prediction.pm
index d3ea931..49a4b76 100644
--- a/lib/WebService/TFL/Bus/Response/Prediction.pm
+++ b/lib/WebService/TFL/Bus/Response/Prediction.pm
@@ -1,5 +1,7 @@
 package WebService::TFL::Bus::Response::Prediction;
-use Moose;
-with 'WebService::TFL::Bus::ResponseTypeRole' => { type => 'prediction' };
+use Moo;
+use namespace::autoclean;
+use WebService::TFL::Bus::ResponseTypeRole;
+with ResponseTypeRole('prediction');
 
 1;
diff --git a/lib/WebService/TFL/Bus/Response/Stop.pm b/lib/WebService/TFL/Bus/Response/Stop.pm
index 3c98ca5..30f2f91 100644
--- a/lib/WebService/TFL/Bus/Response/Stop.pm
+++ b/lib/WebService/TFL/Bus/Response/Stop.pm
@@ -1,5 +1,7 @@
 package WebService::TFL::Bus::Response::Stop;
-use Moose;
-with 'WebService::TFL::Bus::ResponseTypeRole' => { type => 'stop' };
+use Moo;
+use namespace::autoclean;
+use WebService::TFL::Bus::ResponseTypeRole;
+with ResponseTypeRole('stop');
 
 1;
diff --git a/lib/WebService/TFL/Bus/Response/URAVersion.pm b/lib/WebService/TFL/Bus/Response/URAVersion.pm
index 38c8a62..fc0b41f 100644
--- a/lib/WebService/TFL/Bus/Response/URAVersion.pm
+++ b/lib/WebService/TFL/Bus/Response/URAVersion.pm
@@ -1,5 +1,5 @@
 package WebService::TFL::Bus::Response::URAVersion;
-use Moose;
+use Moo;
 use namespace::autoclean;
 
 for my $field (qw(Version TimeStamp)) {