diff --git a/core/src/avm2.rs b/core/src/avm2.rs
index c180f147f..373bf178f 100644
--- a/core/src/avm2.rs
+++ b/core/src/avm2.rs
@@ -36,7 +36,7 @@ mod scope;
 mod script;
 mod slot;
 mod string;
-mod r#trait;
+mod traits;
 mod value;
 
 /// Boxed error alias.
diff --git a/core/src/avm2/class.rs b/core/src/avm2/class.rs
index 81cc8acca..ed193e429 100644
--- a/core/src/avm2/class.rs
+++ b/core/src/avm2/class.rs
@@ -2,9 +2,9 @@
 
 use crate::avm2::method::Method;
 use crate::avm2::names::{Multiname, Namespace, QName};
-use crate::avm2::r#trait::{Trait, TraitKind};
 use crate::avm2::script::TranslationUnit;
 use crate::avm2::string::AvmString;
+use crate::avm2::traits::{Trait, TraitKind};
 use crate::avm2::{Avm2, Error};
 use crate::collect::CollectWrapper;
 use enumset::{EnumSet, EnumSetType};
diff --git a/core/src/avm2/globals.rs b/core/src/avm2/globals.rs
index 5b8914ed8..8747c4373 100644
--- a/core/src/avm2/globals.rs
+++ b/core/src/avm2/globals.rs
@@ -5,9 +5,9 @@ use crate::avm2::class::Class;
 use crate::avm2::method::NativeMethod;
 use crate::avm2::names::{Namespace, QName};
 use crate::avm2::object::{FunctionObject, Object, ScriptObject, TObject};
-use crate::avm2::r#trait::Trait;
 use crate::avm2::scope::Scope;
 use crate::avm2::string::AvmString;
+use crate::avm2::traits::Trait;
 use crate::avm2::value::Value;
 use crate::avm2::Error;
 use gc_arena::{Collect, GcCell, MutationContext};
diff --git a/core/src/avm2/object.rs b/core/src/avm2/object.rs
index a116e05e0..51f83d6dc 100644
--- a/core/src/avm2/object.rs
+++ b/core/src/avm2/object.rs
@@ -4,9 +4,9 @@ use crate::avm2::activation::Activation;
 use crate::avm2::class::Class;
 use crate::avm2::function::Executable;
 use crate::avm2::names::{Multiname, Namespace, QName};
-use crate::avm2::r#trait::{Trait, TraitKind};
 use crate::avm2::scope::Scope;
 use crate::avm2::string::AvmString;
+use crate::avm2::traits::{Trait, TraitKind};
 use crate::avm2::value::{Hint, Value};
 use crate::avm2::Error;
 use gc_arena::{Collect, GcCell, MutationContext};
diff --git a/core/src/avm2/object/function_object.rs b/core/src/avm2/object/function_object.rs
index f83d7ae9b..3020067bb 100644
--- a/core/src/avm2/object/function_object.rs
+++ b/core/src/avm2/object/function_object.rs
@@ -7,9 +7,9 @@ use crate::avm2::method::{Method, NativeMethod};
 use crate::avm2::names::{Namespace, QName};
 use crate::avm2::object::script_object::{ScriptObject, ScriptObjectClass, ScriptObjectData};
 use crate::avm2::object::{Object, ObjectPtr, TObject};
-use crate::avm2::r#trait::Trait;
 use crate::avm2::scope::Scope;
 use crate::avm2::string::AvmString;
+use crate::avm2::traits::Trait;
 use crate::avm2::value::Value;
 use crate::avm2::Error;
 use crate::impl_avm2_custom_object;
diff --git a/core/src/avm2/object/namespace_object.rs b/core/src/avm2/object/namespace_object.rs
index 7fcdb325b..f8761b605 100644
--- a/core/src/avm2/object/namespace_object.rs
+++ b/core/src/avm2/object/namespace_object.rs
@@ -6,8 +6,8 @@ use crate::avm2::class::Class;
 use crate::avm2::names::{Namespace, QName};
 use crate::avm2::object::script_object::{ScriptObjectClass, ScriptObjectData};
 use crate::avm2::object::{Object, ObjectPtr, TObject};
-use crate::avm2::r#trait::Trait;
 use crate::avm2::scope::Scope;
+use crate::avm2::traits::Trait;
 use crate::avm2::value::Value;
 use crate::avm2::Error;
 use crate::impl_avm2_custom_object;
diff --git a/core/src/avm2/object/primitive_object.rs b/core/src/avm2/object/primitive_object.rs
index c0c433782..62bf14cd6 100644
--- a/core/src/avm2/object/primitive_object.rs
+++ b/core/src/avm2/object/primitive_object.rs
@@ -5,9 +5,9 @@ use crate::avm2::class::Class;
 use crate::avm2::names::{Namespace, QName};
 use crate::avm2::object::script_object::{ScriptObjectClass, ScriptObjectData};
 use crate::avm2::object::{Object, ObjectPtr, TObject};
-use crate::avm2::r#trait::Trait;
 use crate::avm2::scope::Scope;
 use crate::avm2::string::AvmString;
+use crate::avm2::traits::Trait;
 use crate::avm2::value::Value;
 use crate::avm2::Error;
 use crate::impl_avm2_custom_object;
diff --git a/core/src/avm2/object/script_object.rs b/core/src/avm2/object/script_object.rs
index c799bf559..2d03c345f 100644
--- a/core/src/avm2/object/script_object.rs
+++ b/core/src/avm2/object/script_object.rs
@@ -7,11 +7,11 @@ use crate::avm2::names::{Namespace, QName};
 use crate::avm2::object::{Object, ObjectPtr, TObject};
 use crate::avm2::property::Property;
 use crate::avm2::property_map::PropertyMap;
-use crate::avm2::r#trait::Trait;
 use crate::avm2::return_value::ReturnValue;
 use crate::avm2::scope::Scope;
 use crate::avm2::slot::Slot;
 use crate::avm2::string::AvmString;
+use crate::avm2::traits::Trait;
 use crate::avm2::value::Value;
 use crate::avm2::Error;
 use gc_arena::{Collect, GcCell, MutationContext};
diff --git a/core/src/avm2/script.rs b/core/src/avm2/script.rs
index b78c76fd4..0b5d76e84 100644
--- a/core/src/avm2/script.rs
+++ b/core/src/avm2/script.rs
@@ -2,8 +2,8 @@
 
 use crate::avm2::class::Class;
 use crate::avm2::method::{BytecodeMethod, Method};
-use crate::avm2::r#trait::Trait;
 use crate::avm2::string::AvmString;
+use crate::avm2::traits::Trait;
 use crate::avm2::{Avm2, Error};
 use crate::collect::CollectWrapper;
 use fnv::FnvHashMap;
diff --git a/core/src/avm2/trait.rs b/core/src/avm2/traits.rs
similarity index 100%
rename from core/src/avm2/trait.rs
rename to core/src/avm2/traits.rs