diff --git a/musikr/src/test/java/org/oxycblt/musikr/tag/NameTest.kt b/musikr/src/test/java/org/oxycblt/musikr/tag/interpret/NamingTest.kt
similarity index 98%
rename from musikr/src/test/java/org/oxycblt/musikr/tag/NameTest.kt
rename to musikr/src/test/java/org/oxycblt/musikr/tag/interpret/NamingTest.kt
index a44f79708..ebe3f8109 100644
--- a/musikr/src/test/java/org/oxycblt/musikr/tag/NameTest.kt
+++ b/musikr/src/test/java/org/oxycblt/musikr/tag/interpret/NamingTest.kt
@@ -16,14 +16,16 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
-package org.oxycblt.musikr.tag
+package org.oxycblt.musikr.tag.interpret
 
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotEquals
 import org.junit.Test
-import org.oxycblt.musikr.tag.interpret.Naming
+import org.oxycblt.musikr.tag.Name
+import org.oxycblt.musikr.tag.Placeholder
+import org.oxycblt.musikr.tag.Token
 
-class NameTest {
+class NamingTest {
     @Test
     fun name_simple_withoutPunct() {
         val name = Naming.simple().name("Loveless", null)