diff --git a/lib/KiokuDB/Set/Deferred.pm b/lib/KiokuDB/Set/Deferred.pm
index 0a385ae..7df14be 100644
--- a/lib/KiokuDB/Set/Deferred.pm
+++ b/lib/KiokuDB/Set/Deferred.pm
@@ -11,7 +11,7 @@ use Scalar::Util qw(refaddr);
 
 use namespace::clean -except => 'meta';
 
-with qw(KiokuDB::Set::Storage) => { excludes => '_apply' };
+with qw(KiokuDB::Set::Storage) => { -excludes => '_apply' };
 
 extends qw(KiokuDB::Set::Base);
 
diff --git a/lib/KiokuDB/Stream/Objects.pm b/lib/KiokuDB/Stream/Objects.pm
index 4ab2353..f85a624 100644
--- a/lib/KiokuDB/Stream/Objects.pm
+++ b/lib/KiokuDB/Stream/Objects.pm
@@ -53,7 +53,7 @@ has _no_scope => (
     is  => "rw",
 );
 
-with qw(Data::Stream::Bulk) => { excludes => 'loaded' };
+with qw(Data::Stream::Bulk) => { -excludes => 'loaded' };
 
 sub next {
 	my $self = shift;
diff --git a/lib/KiokuDB/Test/Fixture/Binary.pm b/lib/KiokuDB/Test/Fixture/Binary.pm
index 94d10b8..dabdb31 100644
--- a/lib/KiokuDB/Test/Fixture/Binary.pm
+++ b/lib/KiokuDB/Test/Fixture/Binary.pm
@@ -16,7 +16,7 @@ use namespace::clean -except => 'meta';
 
 use constant required_backend_roles => qw(BinarySafe);
 
-with qw(KiokuDB::Test::Fixture) => { excludes => 'required_backend_roles' };
+with qw(KiokuDB::Test::Fixture) => { -excludes => 'required_backend_roles' };
 
 my $utf8    = "חיים";
 
diff --git a/lib/KiokuDB/Test/Fixture/Clear.pm b/lib/KiokuDB/Test/Fixture/Clear.pm
index efe310e..a8f0f3e 100644
--- a/lib/KiokuDB/Test/Fixture/Clear.pm
+++ b/lib/KiokuDB/Test/Fixture/Clear.pm
@@ -12,7 +12,7 @@ use namespace::clean -except => 'meta';
 
 use constant required_backend_roles => qw(Clear);
 
-with qw(KiokuDB::Test::Fixture) => { excludes => [qw/sort required_backend_roles/] };
+with qw(KiokuDB::Test::Fixture) => { -excludes => [qw/sort required_backend_roles/] };
 
 sub sort { -10 }
 
diff --git a/lib/KiokuDB/Test/Fixture/Concurrency.pm b/lib/KiokuDB/Test/Fixture/Concurrency.pm
index f13beaa..3803665 100644
--- a/lib/KiokuDB/Test/Fixture/Concurrency.pm
+++ b/lib/KiokuDB/Test/Fixture/Concurrency.pm
@@ -11,7 +11,7 @@ use POSIX qw(_exit :sys_wait_h);
 
 use namespace::clean -except => 'meta';
 
-with qw(KiokuDB::Test::Fixture) => { excludes => [qw/run required_backend_roles/] };
+with qw(KiokuDB::Test::Fixture) => { -excludes => [qw/run required_backend_roles/] };
 
 use constant required_backend_roles => qw(Clear TXN Concurrency::POSIX);
 
diff --git a/lib/KiokuDB/Test/Fixture/MassInsert.pm b/lib/KiokuDB/Test/Fixture/MassInsert.pm
index 7e53030..7835171 100644
--- a/lib/KiokuDB/Test/Fixture/MassInsert.pm
+++ b/lib/KiokuDB/Test/Fixture/MassInsert.pm
@@ -16,7 +16,7 @@ sub p {
     KiokuDB::Test::Person->new(@args);
 }
 
-with qw(KiokuDB::Test::Fixture) => { excludes => [qw/populate sort/] };
+with qw(KiokuDB::Test::Fixture) => { -excludes => [qw/populate sort/] };
 
 sub sort { 100 }
 
diff --git a/lib/KiokuDB/Test/Fixture/ObjectGraph.pm b/lib/KiokuDB/Test/Fixture/ObjectGraph.pm
index 833e286..f362e7b 100644
--- a/lib/KiokuDB/Test/Fixture/ObjectGraph.pm
+++ b/lib/KiokuDB/Test/Fixture/ObjectGraph.pm
@@ -44,7 +44,7 @@ sub clique {
 
 use namespace::clean -except => 'meta';
 
-with qw(KiokuDB::Test::Fixture) => { excludes => [qw/populate sort/] };
+with qw(KiokuDB::Test::Fixture) => { -excludes => [qw/populate sort/] };
 
 has [qw(homer dubya putin)] => (
     isa => "Str",
diff --git a/lib/KiokuDB/Test/Fixture/Overwrite.pm b/lib/KiokuDB/Test/Fixture/Overwrite.pm
index b1d6b3f..07432ba 100644
--- a/lib/KiokuDB/Test/Fixture/Overwrite.pm
+++ b/lib/KiokuDB/Test/Fixture/Overwrite.pm
@@ -36,7 +36,7 @@ sub p {
     KiokuDB::Test::Person->new(@args);
 }
 
-with qw(KiokuDB::Test::Fixture) => { excludes => [qw/populate sort/] };
+with qw(KiokuDB::Test::Fixture) => { -excludes => [qw/populate sort/] };
 
 sub sort { -100 }
 
diff --git a/lib/KiokuDB/Test/Fixture/Refresh.pm b/lib/KiokuDB/Test/Fixture/Refresh.pm
index 1f45507..fa24bbd 100644
--- a/lib/KiokuDB/Test/Fixture/Refresh.pm
+++ b/lib/KiokuDB/Test/Fixture/Refresh.pm
@@ -14,7 +14,7 @@ sub p {
     KiokuDB::Test::Person->new(@args);
 }
 
-with qw(KiokuDB::Test::Fixture) => { excludes => [qw/populate sort/] };
+with qw(KiokuDB::Test::Fixture) => { -excludes => [qw/populate sort/] };
 
 sub sort { -100 }
 
diff --git a/lib/KiokuDB/Test/Fixture/RootSet.pm b/lib/KiokuDB/Test/Fixture/RootSet.pm
index 2bebe97..38566b8 100644
--- a/lib/KiokuDB/Test/Fixture/RootSet.pm
+++ b/lib/KiokuDB/Test/Fixture/RootSet.pm
@@ -11,7 +11,7 @@ use KiokuDB::Test::Company;
 
 use namespace::clean -except => 'meta';
 
-with qw(KiokuDB::Test::Fixture) => { excludes => 'sort' };
+with qw(KiokuDB::Test::Fixture) => { -excludes => 'sort' };
 
 sub sort { -50 }
 
diff --git a/lib/KiokuDB/Test/Fixture/Scan.pm b/lib/KiokuDB/Test/Fixture/Scan.pm
index 832de7e..996faaf 100644
--- a/lib/KiokuDB/Test/Fixture/Scan.pm
+++ b/lib/KiokuDB/Test/Fixture/Scan.pm
@@ -10,7 +10,7 @@ use KiokuDB::Test::Person;
 
 use namespace::clean -except => 'meta';
 
-with qw(KiokuDB::Test::Fixture) => { excludes => 'required_backend_roles' };
+with qw(KiokuDB::Test::Fixture) => { -excludes => 'required_backend_roles' };
 
 use constant required_backend_roles => qw(Clear Scan);
 
diff --git a/lib/KiokuDB/Test/Fixture/SimpleSearch.pm b/lib/KiokuDB/Test/Fixture/SimpleSearch.pm
index de355aa..69196bc 100644
--- a/lib/KiokuDB/Test/Fixture/SimpleSearch.pm
+++ b/lib/KiokuDB/Test/Fixture/SimpleSearch.pm
@@ -10,7 +10,7 @@ use KiokuDB::Test::Person;
 
 use namespace::clean -except => 'meta';
 
-with qw(KiokuDB::Test::Fixture) => { excludes => 'required_backend_roles' };
+with qw(KiokuDB::Test::Fixture) => { -excludes => 'required_backend_roles' };
 
 use constant required_backend_roles => qw(Clear Query::Simple);
 
diff --git a/lib/KiokuDB/Test/Fixture/Small.pm b/lib/KiokuDB/Test/Fixture/Small.pm
index bd4ee9b..3e4750f 100644
--- a/lib/KiokuDB/Test/Fixture/Small.pm
+++ b/lib/KiokuDB/Test/Fixture/Small.pm
@@ -22,7 +22,7 @@ sub p {
     KiokuDB::Test::Person->new(@args);
 }
 
-with qw(KiokuDB::Test::Fixture) => { excludes => [qw/populate sort/] };
+with qw(KiokuDB::Test::Fixture) => { -excludes => [qw/populate sort/] };
 
 sub sort { -100 }
 
diff --git a/lib/KiokuDB/Test/Fixture/TypeMap/Default.pm b/lib/KiokuDB/Test/Fixture/TypeMap/Default.pm
index 8072483..3ede99a 100644
--- a/lib/KiokuDB/Test/Fixture/TypeMap/Default.pm
+++ b/lib/KiokuDB/Test/Fixture/TypeMap/Default.pm
@@ -59,7 +59,7 @@ use constant HAVE_MX_OP             => try { require MooseX::Object::Pluggable }
     has name => ( is => "rw" );
 }
 
-with qw(KiokuDB::Test::Fixture) => { excludes => 'required_backend_roles' };
+with qw(KiokuDB::Test::Fixture) => { -excludes => 'required_backend_roles' };
 
 sub create {
     tie my %refhash, 'Tie::RefHash';
diff --git a/lib/KiokuDB/Test/Fixture/Unicode.pm b/lib/KiokuDB/Test/Fixture/Unicode.pm
index 1e65e9a..8ee0979 100644
--- a/lib/KiokuDB/Test/Fixture/Unicode.pm
+++ b/lib/KiokuDB/Test/Fixture/Unicode.pm
@@ -16,7 +16,7 @@ use namespace::clean -except => 'meta';
 
 use constant required_backend_roles => qw(UnicodeSafe);
 
-with qw(KiokuDB::Test::Fixture) => { excludes => 'required_backend_roles' };
+with qw(KiokuDB::Test::Fixture) => { -excludes => 'required_backend_roles' };
 
 my $unicode = "משה";
 
diff --git a/lib/KiokuDB/TypeMap/Default/JSON.pm b/lib/KiokuDB/TypeMap/Default/JSON.pm
index b24127e..014f9ef 100644
--- a/lib/KiokuDB/TypeMap/Default/JSON.pm
+++ b/lib/KiokuDB/TypeMap/Default/JSON.pm
@@ -8,7 +8,7 @@ use namespace::clean -except => 'meta';
 extends qw(KiokuDB::TypeMap);
 
 with 'KiokuDB::TypeMap::Default::Canonical' => {
-    excludes => [qw(reftype_entries)],
+    -excludes => [qw(reftype_entries)],
 };
 
 has json_boolean_typemap => (
diff --git a/lib/KiokuDB/TypeMap/Entry/MOP.pm b/lib/KiokuDB/TypeMap/Entry/MOP.pm
index f079474..183ee15 100644
--- a/lib/KiokuDB/TypeMap/Entry/MOP.pm
+++ b/lib/KiokuDB/TypeMap/Entry/MOP.pm
@@ -21,7 +21,7 @@ use namespace::clean -except => 'meta';
 with (
     'KiokuDB::TypeMap::Entry::Std',
     'KiokuDB::TypeMap::Entry::Std::Expand' => {
-        alias => { compile_expand => 'compile_expand_body' },
+        -alias => { compile_expand => 'compile_expand_body' },
     }
 );