diff --git a/.github/workflows/maven.test.yaml b/.github/workflows/maven.test.yaml
index d66afac49..9f937ca8b 100644
--- a/.github/workflows/maven.test.yaml
+++ b/.github/workflows/maven.test.yaml
@@ -13,7 +13,8 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-20.04, macos-14, windows-2022 ]
-        java: [ 8, 11, 21 ]
+#        We can't use Java 8, because the main dependency https://github.com/objectionary/eo requires at least Java 11
+        java: [ 11, 21 ]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
diff --git a/README.md b/README.md
index 9e02b6da0..9e66a9567 100644
--- a/README.md
+++ b/README.md
@@ -17,8 +17,11 @@ optimized performance.
 
 # How to use
 
-The plugin can be run using several approaches but for all of them you need
-at least Maven 3.1.+ and Java 8+.
+The plugin can be run using several approaches, but for all of them, you need at
+least Maven 3.1+ and Java 11+. (Actually, the plugin requires Java 8+, but since
+the main dependency [eo](https://github.com/objectionary/eo) requires Java 11,
+we are obligated to use it as well.)
+
 The plugin can convert compiled classes into EOlang by using
 the `disassemble` goal. The `assemble` goal can convert EOlang back
 into bytecode. The default phase for the plugin
@@ -91,12 +94,13 @@ In order to include debug information in the generated EO files, you can set
 `debug` option.
 
 ```xml
+
 <configuration>
   <mode>debug</mode>
 </configuration>
 ```
 
-This option will add line numbers and local variable names to the EO files 
+This option will add line numbers and local variable names to the EO files
 together with their corresponding labels.
 
 ### Disable bytecode verification
@@ -385,5 +389,5 @@ before sending us your pull request please run full Maven build:
 $ mvn clean install -Pqulice
 ```
 
-You will need [Maven 3.3+](https://maven.apache.org) and Java 8+ installed.
+You will need [Maven 3.3+](https://maven.apache.org) and Java 11+ installed.
 
diff --git a/pom.xml b/pom.xml
index d5e0aff91..fe7c1bd29 100644
--- a/pom.xml
+++ b/pom.xml
@@ -120,6 +120,11 @@ SOFTWARE.
       <artifactId>jcabi-manifests</artifactId>
       <!-- version from parent POM -->
     </dependency>
+    <dependency>
+      <groupId>org.eolang</groupId>
+      <artifactId>lints</artifactId>
+      <version>0.0.23</version>
+    </dependency>
     <dependency>
       <groupId>org.cactoos</groupId>
       <artifactId>cactoos</artifactId>
@@ -184,7 +189,7 @@ SOFTWARE.
     <dependency>
       <groupId>org.eolang</groupId>
       <artifactId>eo-parser</artifactId>
-      <version>0.44.0</version>
+      <version>0.46.0</version>
     </dependency>
     <dependency>
       <groupId>com.github.volodya-lombrozo</groupId>
diff --git a/src/it/annotations/pom.xml b/src/it/annotations/pom.xml
index 22557a91c..0f92361c6 100644
--- a/src/it/annotations/pom.xml
+++ b/src/it/annotations/pom.xml
@@ -64,7 +64,7 @@ SOFTWARE.
       <plugin>
         <groupId>org.eolang</groupId>
         <artifactId>eo-maven-plugin</artifactId>
-        <version>0.44.0</version>
+        <version>0.46.0</version>
         <executions>
           <execution>
             <id>convert-xmir-to-eo</id>
diff --git a/src/it/bytecode-to-eo/pom.xml b/src/it/bytecode-to-eo/pom.xml
index 99c447e45..e0702117a 100644
--- a/src/it/bytecode-to-eo/pom.xml
+++ b/src/it/bytecode-to-eo/pom.xml
@@ -70,7 +70,7 @@ SOFTWARE.
       <plugin>
         <groupId>org.eolang</groupId>
         <artifactId>eo-maven-plugin</artifactId>
-        <version>0.44.0</version>
+        <version>0.46.0</version>
         <executions>
           <execution>
             <id>convert-xmir-to-phi</id>
@@ -98,7 +98,7 @@ SOFTWARE.
           <plugin>
             <groupId>org.eolang</groupId>
             <artifactId>eo-maven-plugin</artifactId>
-            <version>0.44.0</version>
+            <version>0.46.0</version>
             <executions>
               <execution>
                 <id>convert-xmir-to-eo</id>
diff --git a/src/it/custom-transformations/pom.xml b/src/it/custom-transformations/pom.xml
index 5674402c3..73e6290cd 100644
--- a/src/it/custom-transformations/pom.xml
+++ b/src/it/custom-transformations/pom.xml
@@ -64,7 +64,7 @@ SOFTWARE.
       <plugin>
         <groupId>org.eolang</groupId>
         <artifactId>eo-maven-plugin</artifactId>
-        <version>0.44.0</version>
+        <version>0.46.0</version>
         <executions>
           <!--
             @todo #610:30min Enable EO Printing in 'custom-transformations' it.
diff --git a/src/it/exceptions/pom.xml b/src/it/exceptions/pom.xml
index ef5d2cb7d..0fd39b7bf 100644
--- a/src/it/exceptions/pom.xml
+++ b/src/it/exceptions/pom.xml
@@ -82,7 +82,7 @@ SOFTWARE.
       <plugin>
         <groupId>org.eolang</groupId>
         <artifactId>eo-maven-plugin</artifactId>
-        <version>0.44.0</version>
+        <version>0.46.0</version>
         <executions>
           <execution>
             <id>convert-xmir-to-eo</id>
diff --git a/src/it/generics/pom.xml b/src/it/generics/pom.xml
index 3b4ce90c5..126785277 100644
--- a/src/it/generics/pom.xml
+++ b/src/it/generics/pom.xml
@@ -64,7 +64,7 @@ SOFTWARE.
       <plugin>
         <groupId>org.eolang</groupId>
         <artifactId>eo-maven-plugin</artifactId>
-        <version>0.44.0</version>
+        <version>0.46.0</version>
         <executions>
           <execution>
             <id>convert-xmir-to-eo</id>
diff --git a/src/it/jna/pom.xml b/src/it/jna/pom.xml
index 724df5791..ec14ff7b2 100644
--- a/src/it/jna/pom.xml
+++ b/src/it/jna/pom.xml
@@ -219,7 +219,7 @@ SOFTWARE.
           <plugin>
             <groupId>org.eolang</groupId>
             <artifactId>eo-maven-plugin</artifactId>
-            <version>0.44.0</version>
+            <version>0.46.0</version>
             <executions>
               <execution>
                 <id>xmir-to-phi</id>
diff --git a/src/it/phi-unphi/pom.xml b/src/it/phi-unphi/pom.xml
index a2b4e7261..89d98d40c 100644
--- a/src/it/phi-unphi/pom.xml
+++ b/src/it/phi-unphi/pom.xml
@@ -89,7 +89,7 @@ SOFTWARE.
       <plugin>
         <groupId>org.eolang</groupId>
         <artifactId>eo-maven-plugin</artifactId>
-        <version>0.44.0</version>
+        <version>0.46.0</version>
         <executions>
           <execution>
             <id>xmir-to-phi</id>
diff --git a/src/it/spring/pom.xml b/src/it/spring/pom.xml
index 32bf557e8..52b86b743 100644
--- a/src/it/spring/pom.xml
+++ b/src/it/spring/pom.xml
@@ -84,7 +84,7 @@ SOFTWARE.
       <plugin>
         <groupId>org.eolang</groupId>
         <artifactId>eo-maven-plugin</artifactId>
-        <version>0.44.0</version>
+        <version>0.46.0</version>
         <executions>
           <execution>
             <id>convert-xmir-to-phi</id>
diff --git a/src/it/spring/verify.groovy b/src/it/spring/verify.groovy
index 000a8aad0..8582ee072 100644
--- a/src/it/spring/verify.groovy
+++ b/src/it/spring/verify.groovy
@@ -32,10 +32,7 @@ def app = new File(basedir, 'target/generated-sources/jeo-xmir/org/eolang/jeo/sp
 assert app.exists()
 assert app.text.contains("metas")
 assert app.text.contains("<head>package</head>")
-// Check that we have "opcode" and "label" imports where they are needed
-assert app.text.contains("<tail>jeo.opcode.return</tail>")
 //Check that if class doesn't have instructions, it doesn't have "opcode" imports.
 def empty = new File(basedir, 'target/generated-sources/jeo-xmir/org/eolang/jeo/spring/WithoutInstructions.xmir')
 assert empty.exists()
-assert !empty.text.contains("<tail>jeo.opcode.return</tail>")
 true
\ No newline at end of file
diff --git a/src/it/takes/pom.xml b/src/it/takes/pom.xml
index 5df194606..405b00b41 100644
--- a/src/it/takes/pom.xml
+++ b/src/it/takes/pom.xml
@@ -80,7 +80,7 @@ SOFTWARE.
       <plugin>
         <groupId>org.eolang</groupId>
         <artifactId>eo-maven-plugin</artifactId>
-        <version>0.44.0</version>
+        <version>0.46.0</version>
         <executions>
           <execution>
             <id>convert-xmir-to-phi</id>
diff --git a/src/main/java/org/eolang/jeo/representation/CanonicalXmir.java b/src/main/java/org/eolang/jeo/representation/CanonicalXmir.java
index ba3a6e2ee..8ba4addaf 100644
--- a/src/main/java/org/eolang/jeo/representation/CanonicalXmir.java
+++ b/src/main/java/org/eolang/jeo/representation/CanonicalXmir.java
@@ -39,7 +39,7 @@
 import java.nio.file.Path;
 import org.cactoos.io.InputOf;
 import org.eolang.parser.EoSyntax;
-import org.eolang.parser.xmir.Xmir;
+import org.eolang.parser.Xmir;
 
 /**
  * Canonical XMIR.
@@ -109,7 +109,7 @@ public XML plain() {
      * @return EO.
      */
     private String toEo() {
-        return new Xmir.Default(this.canonical).toEO();
+        return new Xmir(this.canonical).toEO();
     }
 
     /**
@@ -147,17 +147,17 @@ private static XML unroll(final XML parsed) {
         return new Xsline(
             new TrFast(
                 new TrJoined<Shift>(
-                    new TrClasspath<Shift>(
+                    new TrClasspath<>(
                         "/org/eolang/parser/wrap-method-calls.xsl"
                     ).back(),
-                    new TrDefault<Shift>(
+                    new TrDefault<>(
                         new StEndless(
                             new StClasspath(
                                 "/org/eolang/parser/roll-bases.xsl"
                             )
                         )
                     ),
-                    new TrClasspath<Shift>(
+                    new TrClasspath<>(
                         "/org/eolang/parser/add-refs.xsl",
                         "/org/eolang/parser/add-cuts.xsl"
                     ).back(),
@@ -169,7 +169,9 @@ private static XML unroll(final XML parsed) {
                         )
                     ),
                     new TrClasspath<Shift>(
-                        "/org/eolang/parser/remove-cuts.xsl"
+                        "/org/eolang/parser/remove-cuts.xsl",
+                        "/org/eolang/parser/add-default-package.xsl",
+                        "/org/eolang/parser/explicit-data.xsl"
                     ).back()
                 ),
                 CanonicalXmir.class,
diff --git a/src/main/java/org/eolang/jeo/representation/VerifiedEo.java b/src/main/java/org/eolang/jeo/representation/VerifiedEo.java
index 9d54bb8df..11738b3ff 100644
--- a/src/main/java/org/eolang/jeo/representation/VerifiedEo.java
+++ b/src/main/java/org/eolang/jeo/representation/VerifiedEo.java
@@ -23,9 +23,15 @@
  */
 package org.eolang.jeo.representation;
 
+import com.jcabi.xml.StrictXML;
 import com.jcabi.xml.XML;
 import com.jcabi.xml.XMLDocument;
-import org.eolang.parser.Schema;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.stream.Collectors;
+import org.eolang.lints.Defect;
+import org.eolang.lints.Program;
+import org.eolang.lints.Severity;
 import org.xembly.Directive;
 import org.xembly.ImpossibleModificationException;
 import org.xembly.Xembler;
@@ -55,11 +61,32 @@ final class VerifiedEo {
      * We also check if the EO is correct.
      * @return XML representation.
      * @throws ImpossibleModificationException If something goes wrong.
+     * @todo #939:60min Fix All The Warnings in the EO Representation.
+     *  Here we just catch only the errors in the EO representation.
+     *  We need to fix all the warnings in the EO representation as well.
      */
     XML asXml() throws ImpossibleModificationException {
         final XML res = new XMLDocument(new Xembler(this.directives).xml());
-        new Schema(res).check();
+        try {
+            final Collection<Defect> defects = new Program(new StrictXML(res)).defects()
+                .stream()
+                .filter(defect -> defect.severity() == Severity.ERROR)
+                .collect(Collectors.toList());
+            if (!defects.isEmpty()) {
+                throw new IllegalStateException(
+                    String.format(
+                        "EO is incorrect: %s, %n%s%n",
+                        defects,
+                        res
+                    )
+                );
+            }
+        } catch (final IOException exception) {
+            throw new IllegalStateException(
+                String.format("Failed to verify EO: %n%s%n", res),
+                exception
+            );
+        }
         return res;
     }
-
 }
diff --git a/src/main/java/org/eolang/jeo/representation/XmirRepresentation.java b/src/main/java/org/eolang/jeo/representation/XmirRepresentation.java
index a3ca212da..66fd7b833 100644
--- a/src/main/java/org/eolang/jeo/representation/XmirRepresentation.java
+++ b/src/main/java/org/eolang/jeo/representation/XmirRepresentation.java
@@ -23,28 +23,23 @@
  */
 package org.eolang.jeo.representation;
 
+import com.jcabi.xml.StrictXML;
 import com.jcabi.xml.XML;
+import com.jcabi.xml.XMLDocument;
 import java.io.FileNotFoundException;
-import java.io.IOException;
 import java.nio.file.Path;
 import java.util.Optional;
 import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamSource;
-import javax.xml.validation.SchemaFactory;
 import javax.xml.xpath.XPath;
 import javax.xml.xpath.XPathConstants;
 import javax.xml.xpath.XPathExpressionException;
 import javax.xml.xpath.XPathFactory;
-import org.cactoos.io.ResourceOf;
-import org.cactoos.io.UncheckedInput;
 import org.cactoos.scalar.Sticky;
 import org.cactoos.scalar.Synced;
 import org.cactoos.scalar.Unchecked;
 import org.eolang.jeo.representation.bytecode.Bytecode;
 import org.eolang.jeo.representation.xmir.XmlProgram;
 import org.w3c.dom.Node;
-import org.xml.sax.SAXException;
 
 /**
  * Intermediate representation of a class files from XMIR.
@@ -155,7 +150,7 @@ public String name() {
     public Bytecode toBytecode() {
         final Node xmir = this.xml.value();
         try {
-            new OptimizedSchema(xmir).check();
+            new StrictXML(new XMLDocument(new XMLDocument(xmir).toString())).validate();
             return new XmlProgram(xmir).bytecode().bytecode();
         } catch (final IllegalArgumentException exception) {
             throw new IllegalArgumentException(
@@ -207,63 +202,4 @@ private static Node open(final Path path) {
             );
         }
     }
-
-    /**
-     * Optimized schema for XMIR.
-     * It is an optimized version of {@link org.eolang.parser.Schema} class.
-     * @since 0.6
-     * @todo #889:30min Use the `Schema` class instead of `OptimizedSchema`.
-     *  The `OptimizedSchema` class is a temporary solution to avoid the performance
-     *  issues with the `Schema` class. We will be able to remove this class after
-     *  the following issue is resolved:
-     *  https://github.com/jcabi/jcabi-xml/issues/277
-     */
-    private static class OptimizedSchema {
-        /**
-         * Node.
-         */
-        private final Node node;
-
-        /**
-         * Schema factory.
-         */
-        private final SchemaFactory factory;
-
-        /**
-         * Constructor.
-         * @param node Node.
-         */
-        OptimizedSchema(final Node node) {
-            this(node, SchemaFactory.newInstance("http://www.w3.org/2001/XMLSchema"));
-        }
-
-        /**
-         * Constructor.
-         * @param node Node.
-         * @param factory Schema factory.
-         */
-        private OptimizedSchema(final Node node, final SchemaFactory factory) {
-            this.node = node;
-            this.factory = factory;
-        }
-
-        /**
-         * Check the node.
-         */
-        void check() {
-            try {
-                this.factory.newSchema(
-                    new StreamSource(new UncheckedInput(new ResourceOf("XMIR.xsd")).stream())
-                ).newValidator().validate(new DOMSource(this.node));
-            } catch (final IOException | SAXException exception) {
-                throw new IllegalStateException(
-                    String.format(
-                        "There are XSD violations, see the log",
-                        exception.getMessage()
-                    ),
-                    exception
-                );
-            }
-        }
-    }
 }
diff --git a/src/main/java/org/eolang/jeo/representation/bytecode/BytecodeProgram.java b/src/main/java/org/eolang/jeo/representation/bytecode/BytecodeProgram.java
index a57354586..b2951d633 100644
--- a/src/main/java/org/eolang/jeo/representation/bytecode/BytecodeProgram.java
+++ b/src/main/java/org/eolang/jeo/representation/bytecode/BytecodeProgram.java
@@ -154,10 +154,7 @@ public DirectivesProgram directives(final String listing) {
         return new DirectivesProgram(
             listing,
             clazz,
-            new DirectivesMetas(
-                classname,
-                clazz
-            )
+            new DirectivesMetas(classname)
         );
     }
 }
diff --git a/src/main/java/org/eolang/jeo/representation/directives/DirectivesAbstractObject.java b/src/main/java/org/eolang/jeo/representation/directives/DirectivesAbstractObject.java
deleted file mode 100644
index 7b2aaf8b4..000000000
--- a/src/main/java/org/eolang/jeo/representation/directives/DirectivesAbstractObject.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * The MIT License (MIT)
- *
- * Copyright (c) 2016-2024 Objectionary.com
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-package org.eolang.jeo.representation.directives;
-
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import java.util.stream.Collectors;
-import org.xembly.Directive;
-import org.xembly.Directives;
-
-/**
- * Directives Abstract Object.
- * @since 0.6
- */
-public final class DirectivesAbstractObject implements Iterable<Directive> {
-
-    /**
-     * The name of the object.
-     */
-    private final String name;
-
-    /**
-     * The inner objects.
-     */
-    private final List<Directives> inner;
-
-    /**
-     * Constructor.
-     * @param name The name of the object.
-     * @param inner Inner objects.
-     */
-    @SafeVarargs
-    DirectivesAbstractObject(final String name, final Iterable<Directive>... inner) {
-        this(name, Arrays.stream(inner).map(Directives::new).collect(Collectors.toList()));
-    }
-
-    /**
-     * Constructor.
-     * @param name The name of the object.
-     * @param inner Inner objects.
-     */
-    DirectivesAbstractObject(final String name, final List<Directives> inner) {
-        this.name = name;
-        this.inner = inner;
-    }
-
-    @Override
-    public Iterator<Directive> iterator() {
-        return new Directives().add("o")
-            .attr("name", this.name)
-            .attr("abstract", "")
-            .append(this.inner.stream().reduce(new Directives(), Directives::append))
-            .up()
-            .iterator();
-    }
-}
diff --git a/src/main/java/org/eolang/jeo/representation/directives/DirectivesAnnotations.java b/src/main/java/org/eolang/jeo/representation/directives/DirectivesAnnotations.java
index 37cf1539a..8953219ce 100644
--- a/src/main/java/org/eolang/jeo/representation/directives/DirectivesAnnotations.java
+++ b/src/main/java/org/eolang/jeo/representation/directives/DirectivesAnnotations.java
@@ -23,10 +23,12 @@
  */
 package org.eolang.jeo.representation.directives;
 
+import java.security.SecureRandom;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Random;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import org.xembly.Directive;
@@ -39,6 +41,11 @@
 @EqualsAndHashCode
 public final class DirectivesAnnotations implements Iterable<Directive> {
 
+    /**
+     * Random number generator.
+     */
+    private static final Random RANDOM = new SecureRandom();
+
     /**
      * All the annotations.
      */
@@ -88,7 +95,15 @@ public DirectivesAnnotations(final List<Iterable<Directive>> annotations, final
      * @param annotations Annotations.
      */
     private DirectivesAnnotations(final List<Iterable<Directive>> annotations) {
-        this(annotations, "annotations");
+        this(
+            annotations,
+            String.format(
+                String.format(
+                    "annotations-%d",
+                    Math.abs(DirectivesAnnotations.RANDOM.nextInt())
+                )
+            )
+        );
     }
 
     @Override
diff --git a/src/main/java/org/eolang/jeo/representation/directives/DirectivesClass.java b/src/main/java/org/eolang/jeo/representation/directives/DirectivesClass.java
index 054562c39..7bdfb300e 100644
--- a/src/main/java/org/eolang/jeo/representation/directives/DirectivesClass.java
+++ b/src/main/java/org/eolang/jeo/representation/directives/DirectivesClass.java
@@ -173,7 +173,8 @@ private DirectivesClass(
 
     @Override
     public Iterator<Directive> iterator() {
-        return new DirectivesAbstractObject(
+        return new DirectivesJeoObject(
+            "class",
             this.name.name(),
             this.properties,
             this.fields.stream().map(Directives::new).reduce(new Directives(), Directives::append),
diff --git a/src/main/java/org/eolang/jeo/representation/directives/DirectivesJeoObject.java b/src/main/java/org/eolang/jeo/representation/directives/DirectivesJeoObject.java
index 246bab329..12363cd92 100644
--- a/src/main/java/org/eolang/jeo/representation/directives/DirectivesJeoObject.java
+++ b/src/main/java/org/eolang/jeo/representation/directives/DirectivesJeoObject.java
@@ -125,6 +125,7 @@ public Iterator<Directive> iterator() {
         }
         return directives
             .append(this.inner.stream().reduce(new Directives(), Directives::append))
-            .up().iterator();
+            .up()
+            .iterator();
     }
 }
diff --git a/src/main/java/org/eolang/jeo/representation/directives/DirectivesMaxs.java b/src/main/java/org/eolang/jeo/representation/directives/DirectivesMaxs.java
index 897de9453..25ed3519c 100644
--- a/src/main/java/org/eolang/jeo/representation/directives/DirectivesMaxs.java
+++ b/src/main/java/org/eolang/jeo/representation/directives/DirectivesMaxs.java
@@ -62,10 +62,10 @@ public DirectivesMaxs(final int stack, final int locals) {
 
     @Override
     public Iterator<Directive> iterator() {
-        return new DirectivesAbstractObject(
+        return new DirectivesJeoObject(
             "maxs",
-            new DirectivesValue("stack", this.stack),
-            new DirectivesValue("locals", this.locals)
+            new DirectivesValue(this.stack),
+            new DirectivesValue(this.locals)
         ).iterator();
     }
 }
diff --git a/src/main/java/org/eolang/jeo/representation/directives/DirectivesMetas.java b/src/main/java/org/eolang/jeo/representation/directives/DirectivesMetas.java
index 7fe75bfc0..536c28fc3 100644
--- a/src/main/java/org/eolang/jeo/representation/directives/DirectivesMetas.java
+++ b/src/main/java/org/eolang/jeo/representation/directives/DirectivesMetas.java
@@ -23,15 +23,11 @@
  */
 package org.eolang.jeo.representation.directives;
 
-import com.jcabi.xml.XMLDocument;
-import java.util.HashSet;
 import java.util.Iterator;
-import java.util.Set;
 import org.eolang.jeo.representation.ClassName;
 import org.eolang.jeo.representation.PrefixedName;
 import org.xembly.Directive;
 import org.xembly.Directives;
-import org.xembly.Xembler;
 
 /**
  * Directives for meta-information of a class.
@@ -44,41 +40,23 @@ public final class DirectivesMetas implements Iterable<Directive> {
      */
     private final ClassName name;
 
-    /**
-     * Class directives.
-     */
-    private final DirectivesClass clazz;
-
     /**
      * Constructor.
      * @param classname Class name.
      */
     public DirectivesMetas(final ClassName classname) {
-        this(classname, new DirectivesClass(new ClassName("org.jeo", "SomeClass")));
-    }
-
-    /**
-     * Constructor.
-     * @param classname Class name.
-     * @param clazz Class directives.
-     */
-    public DirectivesMetas(
-        final ClassName classname,
-        final DirectivesClass clazz
-    ) {
         this.name = classname;
-        this.clazz = clazz;
     }
 
     @Override
     public Iterator<Directive> iterator() {
-        final Directives metas = new Directives().add("metas").append(this.pckg());
-        this.jeo()
-            .stream()
-            .filter(object -> !object.isEmpty())
-            .map(DirectivesMetas::alias)
-            .forEach(metas::append);
-        return metas.up().iterator();
+        final Iterator<Directive> result;
+        if (this.name.pckg().isEmpty()) {
+            result = new Directives().iterator();
+        } else {
+            result = new Directives().add("metas").append(this.pckg()).up().iterator();
+        }
+        return result;
     }
 
     /**
@@ -111,36 +89,4 @@ private Directives pckg() {
         }
         return result;
     }
-
-    /**
-     * Find all jeo objects.
-     * @return Set of jeo objects.
-     * @todo #883:90min Optimize jeo.* Objects Collection for Metas.
-     *  Currently, we are required to pre-build a part of XML, find all the jeo objects
-     *  by using Xpath and then build the XML. This is not efficient.
-     *  We should find a way to collect all the jeo objects on the way.
-     */
-    private Set<String> jeo() {
-        return new HashSet<>(
-            new XMLDocument(
-                new Xembler(
-                    new Directives(this.clazz)
-                ).xmlQuietly()
-            ).xpath(".//o[starts-with(@base, 'jeo.')]/@base")
-        );
-    }
-
-    /**
-     * Alias directive for an object.
-     * @param object Some object name.
-     * @return Alias directive.
-     */
-    private static Directives alias(final String object) {
-        return new Directives()
-            .add("meta")
-            .add("head").set("alias").up()
-            .add("tail").set(object).up()
-            .add("part").set(object).up()
-            .up();
-    }
 }
diff --git a/src/main/java/org/eolang/jeo/representation/directives/DirectivesMethod.java b/src/main/java/org/eolang/jeo/representation/directives/DirectivesMethod.java
index 41b8d3c05..449558d26 100644
--- a/src/main/java/org/eolang/jeo/representation/directives/DirectivesMethod.java
+++ b/src/main/java/org/eolang/jeo/representation/directives/DirectivesMethod.java
@@ -159,13 +159,14 @@ public DirectivesMethod withAnnotation(final DirectivesAnnotation annotation) {
 
     @Override
     public Iterator<Directive> iterator() {
-        return new DirectivesAbstractObject(
+        return new DirectivesJeoObject(
+            "method",
             new PrefixedName(this.name.encoded()).encode(),
             Stream.concat(
                 Stream.of(
                     this.properties,
                     this.annotations,
-                    new DirectivesSeq("@", this.instructions),
+                    new DirectivesSeq("body", this.instructions),
                     new DirectivesSeq(
                         String.format("trycatchblocks-%s", this.name.name()),
                         this.exceptions
diff --git a/src/main/java/org/eolang/jeo/representation/directives/DirectivesMethodParams.java b/src/main/java/org/eolang/jeo/representation/directives/DirectivesMethodParams.java
index e13520e6d..83cccd3e1 100644
--- a/src/main/java/org/eolang/jeo/representation/directives/DirectivesMethodParams.java
+++ b/src/main/java/org/eolang/jeo/representation/directives/DirectivesMethodParams.java
@@ -60,7 +60,6 @@ public DirectivesMethodParams(final List<Iterable<Directive>> params) {
     public Iterator<Directive> iterator() {
         return new DirectivesJeoObject(
             "params",
-            "method-params",
             this.params.stream().map(Directives::new).collect(Collectors.toList())
         ).iterator();
     }
diff --git a/src/main/java/org/eolang/jeo/representation/directives/DirectivesMethodProperties.java b/src/main/java/org/eolang/jeo/representation/directives/DirectivesMethodProperties.java
index 16650bf13..34ef8f307 100644
--- a/src/main/java/org/eolang/jeo/representation/directives/DirectivesMethodProperties.java
+++ b/src/main/java/org/eolang/jeo/representation/directives/DirectivesMethodProperties.java
@@ -126,10 +126,10 @@ public DirectivesMethodProperties(
     @Override
     public Iterator<Directive> iterator() {
         return new Directives()
-            .append(new DirectivesValue("access", this.access))
-            .append(new DirectivesValue("descriptor", this.descriptor))
-            .append(new DirectivesValue("signature", this.signature))
-            .append(new DirectivesValues("exceptions", this.exceptions))
+            .append(new DirectivesValue(this.access))
+            .append(new DirectivesValue(this.descriptor))
+            .append(new DirectivesValue(this.signature))
+            .append(new DirectivesValues(this.exceptions))
             .append(this.max.get())
             .append(this.params)
             .iterator();
diff --git a/src/main/java/org/eolang/jeo/representation/directives/DirectivesProgram.java b/src/main/java/org/eolang/jeo/representation/directives/DirectivesProgram.java
index 806871814..e377ddf52 100644
--- a/src/main/java/org/eolang/jeo/representation/directives/DirectivesProgram.java
+++ b/src/main/java/org/eolang/jeo/representation/directives/DirectivesProgram.java
@@ -109,11 +109,13 @@ public Iterator<Directive> iterator() {
             .format(DateTimeFormatter.ISO_INSTANT);
         final Directives directives = new Directives();
         directives.add("program")
+            .attr("xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance")
             .attr("name", this.metas.className().name())
             .attr("version", Manifests.read("JEO-Version"))
             .attr("revision", Manifests.read("JEO-Revision"))
             .attr("dob", Manifests.read("JEO-Dob"))
             .attr("time", now)
+            .attr("xsi:noNamespaceSchemaLocation", "https://www.eolang.org/xsd/XMIR-0.46.0.xsd")
             .add("listing")
             .set(this.listing)
             .up()
diff --git a/src/main/java/org/eolang/jeo/representation/directives/DirectivesSeq.java b/src/main/java/org/eolang/jeo/representation/directives/DirectivesSeq.java
index 09371752e..aa244ca9f 100644
--- a/src/main/java/org/eolang/jeo/representation/directives/DirectivesSeq.java
+++ b/src/main/java/org/eolang/jeo/representation/directives/DirectivesSeq.java
@@ -23,10 +23,12 @@
  */
 package org.eolang.jeo.representation.directives;
 
+import java.security.SecureRandom;
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Objects;
+import java.util.Random;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import org.cactoos.scalar.LengthOf;
@@ -39,6 +41,10 @@
  * @since 0.6
  */
 public final class DirectivesSeq implements Iterable<Directive> {
+    /**
+     * Random number generator.
+     */
+    private static final Random RANDOM = new SecureRandom();
 
     /**
      * Name of the sequence.
@@ -66,7 +72,7 @@ public DirectivesSeq(final String name, final List<? extends Iterable<Directive>
      */
     @SafeVarargs
     DirectivesSeq(final Iterable<Directive>... elements) {
-        this("@", elements);
+        this("seq", elements);
     }
 
     /**
@@ -82,12 +88,13 @@ private DirectivesSeq(final String name, final Iterable<Directive>... elements)
 
     @Override
     public Iterator<Directive> iterator() {
+        final int number = Math.abs(DirectivesSeq.RANDOM.nextInt());
         final List<Directives> all = this.stream()
             .map(Directives::new)
             .collect(Collectors.toList());
         return new DirectivesJeoObject(
             String.format("seq.of%d", all.size()),
-            this.name,
+            String.format("%s-%d", this.name, number),
             all
         ).iterator();
     }
diff --git a/src/main/java/org/eolang/jeo/representation/xmir/XmlClass.java b/src/main/java/org/eolang/jeo/representation/xmir/XmlClass.java
index 86588b9f9..cb710fe27 100644
--- a/src/main/java/org/eolang/jeo/representation/xmir/XmlClass.java
+++ b/src/main/java/org/eolang/jeo/representation/xmir/XmlClass.java
@@ -161,7 +161,7 @@ private XmlClassProperties properties() {
      */
     private List<XmlMethod> methods() {
         return this.node.children()
-            .filter(o -> !o.attribute("base").isPresent())
+            .filter(o -> o.attribute("base").map("jeo.method"::equals).orElse(false))
             .map(XmlMethod::new)
             .collect(Collectors.toList());
     }
diff --git a/src/main/java/org/eolang/jeo/representation/xmir/XmlMethod.java b/src/main/java/org/eolang/jeo/representation/xmir/XmlMethod.java
index 749abf56f..7ea9764c1 100644
--- a/src/main/java/org/eolang/jeo/representation/xmir/XmlMethod.java
+++ b/src/main/java/org/eolang/jeo/representation/xmir/XmlMethod.java
@@ -189,7 +189,7 @@ private String name() {
      * @return Instructions.
      */
     private List<XmlBytecodeEntry> instructions() {
-        return this.node.child("name", "@")
+        return this.node.child("name", "body")
             .children()
             .filter(element -> element.attribute("base").isPresent())
             .map(XmlNode::toEntry)
@@ -202,7 +202,7 @@ private List<XmlBytecodeEntry> instructions() {
      * @return Maxs.
      */
     private Optional<XmlMaxs> maxs() {
-        return this.node.optchild("name", "maxs").map(XmlMaxs::new);
+        return this.node.optchild("base", "jeo.maxs").map(XmlMaxs::new);
     }
 
     /**
@@ -279,7 +279,7 @@ private List<XmlTryCatchEntry> trycatchEntries() {
                     .map(s -> s.contains("trycatchblocks"))
                     .orElse(false))
             .flatMap(XmlNode::children)
-            .map(entry -> new XmlTryCatchEntry(entry))
+            .map(XmlTryCatchEntry::new)
             .collect(Collectors.toList());
     }
 
diff --git a/src/main/java/org/eolang/jeo/representation/xmir/XmlNode.java b/src/main/java/org/eolang/jeo/representation/xmir/XmlNode.java
index 2ce640f66..ecc0b5760 100644
--- a/src/main/java/org/eolang/jeo/representation/xmir/XmlNode.java
+++ b/src/main/java/org/eolang/jeo/representation/xmir/XmlNode.java
@@ -112,12 +112,15 @@ public String text() {
      * @return Attribute.
      */
     public Optional<String> attribute(final String name) {
-        final Optional<String> result;
-        final NamedNodeMap attrs = this.node.getAttributes();
-        if (attrs == null) {
-            result = Optional.empty();
-        } else {
-            result = Optional.ofNullable(attrs.getNamedItem(name)).map(Node::getTextContent);
+        Optional<String> result = Optional.empty();
+        final NamedNodeMap attributes = this.node.getAttributes();
+        final int length = attributes.getLength();
+        for (int index = 0; index < length; ++index) {
+            final Node item = attributes.item(index);
+            if (item.getNodeName().startsWith(name)) {
+                result = Optional.of(item.getTextContent());
+                break;
+            }
         }
         return result;
     }
@@ -194,7 +197,7 @@ XmlNode firstChild() {
     boolean hasAttribute(final String name, final String value) {
         return this.attribute(name)
             .map(String::valueOf)
-            .map(val -> val.equals(value))
+            .map(val -> val.startsWith(value))
             .orElse(false);
     }
 
diff --git a/src/main/resources/org/eolang/parser/vars-float-down.xsl b/src/main/resources/org/eolang/parser/vars-float-down.xsl
index 83360f29a..5ffcc0135 100644
--- a/src/main/resources/org/eolang/parser/vars-float-down.xsl
+++ b/src/main/resources/org/eolang/parser/vars-float-down.xsl
@@ -58,7 +58,14 @@ SOFTWARE.
     <xsl:variable name="found" select="key('o-by-line', $reference)"/>
     <xsl:element name="o">
       <xsl:copy-of select="$found/@*[name() != 'cut']"/>
-      <xsl:apply-templates select="$found/o"/>
+      <xsl:choose>
+        <xsl:when test="$found/o">
+          <xsl:apply-templates select="$found/o"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:value-of select="$found"/>
+        </xsl:otherwise>
+      </xsl:choose>
     </xsl:element>
   </xsl:template>
 </xsl:stylesheet>
diff --git a/src/test/java/it/JavaToEoTest.java b/src/test/java/it/JavaToEoTest.java
index 7534ba9a3..91b1406b5 100644
--- a/src/test/java/it/JavaToEoTest.java
+++ b/src/test/java/it/JavaToEoTest.java
@@ -32,7 +32,7 @@
 import java.util.List;
 import java.util.stream.Stream;
 import org.eolang.jeo.representation.BytecodeRepresentation;
-import org.eolang.parser.xmir.Xmir;
+import org.eolang.parser.Xmir;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.Disabled;
@@ -69,7 +69,7 @@ void compilesJavaAndTranspilesBytecodeToEo(final Resource resource) {
                 eolang,
                 java,
                 actual,
-                new Xmir.Default(actual).toEO()
+                new Xmir(actual).toEO()
             ),
             actual,
             Matchers.equalTo(new EoSource(eolang).parse())
diff --git a/src/test/java/org/eolang/jeo/representation/XmirRepresentationTest.java b/src/test/java/org/eolang/jeo/representation/XmirRepresentationTest.java
index a9ce9d879..b48762c66 100644
--- a/src/test/java/org/eolang/jeo/representation/XmirRepresentationTest.java
+++ b/src/test/java/org/eolang/jeo/representation/XmirRepresentationTest.java
@@ -53,6 +53,11 @@ final class XmirRepresentationTest {
     private static final String MESSAGE =
         "The bytecode representation of the EO object is not correct,%nexpected:%n%s%nbut got:%n%s";
 
+    /**
+     * Math class name.
+     */
+    private static final String MATH = "org/eolang/foo/Math";
+
     @Test
     void retrievesName() {
         final String name = "Math";
@@ -80,7 +85,7 @@ void returnsXmlRepresentationOfEo() {
             "The XML representation of the EO object is not correct",
             new BytecodeProgram(
                 "org.eolang",
-                new BytecodeClass("org/eolang/foo/Math")
+                new BytecodeClass(XmirRepresentationTest.MATH)
             ).xml(),
             XhtmlMatchers.hasXPath("/program[@name='j$Math']")
         );
@@ -139,7 +144,7 @@ void failsToOpenBrokenXmirRepresentationFromFile(@TempDir final Path dir) throws
         Files.write(
             xmir,
             new BytecodeProgram(
-                new BytecodeClass("org/eolang/foo/Math")
+                new BytecodeClass(XmirRepresentationTest.MATH)
             ).xml().toString().substring(42).getBytes(StandardCharsets.UTF_8)
         );
         MatcherAssert.assertThat(
@@ -167,7 +172,7 @@ void failsToOpenBrokenXmirRepresentationFromFile(@TempDir final Path dir) throws
     @SuppressWarnings("PMD.GuardLogStatement")
     void convertsToXmirAndBack() {
         final Bytecode before = new BytecodeProgram(
-            new BytecodeClass("org/eolang/foo/Math")
+            new BytecodeClass(XmirRepresentationTest.MATH)
                 .helloWorldMethod()
         ).bytecode();
         final int attempts = 500;
@@ -198,16 +203,33 @@ void throwsExceptionIfXmirIsInvalid() {
         MatcherAssert.assertThat(
             "We excpect that XSD violation message will be easily understandable by developers",
             Assertions.assertThrows(
-                IllegalStateException.class,
+                IllegalArgumentException.class,
                 () -> new XmirRepresentation(
                     new XMLDocument(
                         new BytecodeProgram(
-                            new BytecodeClass("org/eolang/foo/Math")
+                            new BytecodeClass(XmirRepresentationTest.MATH)
                         ).xml().toString().replace("<head>package</head>", "")
                     )
                 ).toBytecode()
             ).getCause().getMessage(),
-            Matchers.containsString("There are XSD violations, see the log")
+            Matchers.containsString(
+                "1 error(s) in XML document: -1:-1: cvc-complex-type.2.4.a: Invalid content was found starting with element 'tail'. One of '{head}' is expected."
+            )
+        );
+    }
+
+    @Test
+    void createsXmirRepresentationFromFile(@TempDir final Path path) throws IOException {
+        final BytecodeProgram program = new BytecodeProgram(
+            new BytecodeClass(XmirRepresentationTest.MATH).helloWorldMethod()
+        );
+        final Bytecode expected = program.bytecode();
+        final Path address = path.resolve("Math.xmir");
+        Files.write(address, program.xml().toString().getBytes(StandardCharsets.UTF_8));
+        MatcherAssert.assertThat(
+            "We expect that Xmir representation will be created from the file successfully",
+            new XmirRepresentation(address).toBytecode(),
+            Matchers.equalTo(expected)
         );
     }
 }
diff --git a/src/test/java/org/eolang/jeo/representation/bytecode/BytecodeMethodTest.java b/src/test/java/org/eolang/jeo/representation/bytecode/BytecodeMethodTest.java
index 08d529478..2f1b3d4b8 100644
--- a/src/test/java/org/eolang/jeo/representation/bytecode/BytecodeMethodTest.java
+++ b/src/test/java/org/eolang/jeo/representation/bytecode/BytecodeMethodTest.java
@@ -370,7 +370,7 @@ void doesNotContainTryCatchBlock() {
             "We expect that method without try-catch block doesn't contain try-catch directives.",
             new BytecodeProgram(new BytecodeClass().helloWorldMethod()).xml().toString(),
             XhtmlMatchers.hasXPath(
-                ".//o[contains(@base,'seq.of0') and @name='trycatchblocks-main']"
+                ".//o[contains(@base,'seq.of0') and contains(@name,'trycatchblocks-main')]"
             )
         );
     }
diff --git a/src/test/java/org/eolang/jeo/representation/directives/DirectivesAnnotationsTest.java b/src/test/java/org/eolang/jeo/representation/directives/DirectivesAnnotationsTest.java
index 9440030eb..0c8946581 100644
--- a/src/test/java/org/eolang/jeo/representation/directives/DirectivesAnnotationsTest.java
+++ b/src/test/java/org/eolang/jeo/representation/directives/DirectivesAnnotationsTest.java
@@ -24,7 +24,6 @@
 package org.eolang.jeo.representation.directives;
 
 import com.jcabi.matchers.XhtmlMatchers;
-import org.eolang.jeo.matchers.SameXml;
 import org.hamcrest.MatcherAssert;
 import org.junit.jupiter.api.Test;
 import org.xembly.ImpossibleModificationException;
@@ -41,7 +40,9 @@ void returnsEmptyDirectviesIfNoAnnotations() throws ImpossibleModificationExcept
         MatcherAssert.assertThat(
             "Must return empty directives if no annotations",
             new Xembler(new DirectivesAnnotations()).xml(),
-            new SameXml("<o base='jeo.seq.of0' name='annotations'/>")
+            XhtmlMatchers.hasXPaths(
+                "/o[contains(@base,'jeo.seq.of0') and contains(@name,'annotations')]"
+            )
         );
     }
 
@@ -54,13 +55,13 @@ void returnsSingleAnnotation() throws ImpossibleModificationException {
                 new DirectivesAnnotations().add(new DirectivesAnnotation(annotation, true))
             ).xml(),
             XhtmlMatchers.hasXPaths(
-                "/o[contains(@base,'seq.of1') and @name='annotations']/o",
+                "/o[contains(@base,'seq.of1') and contains(@name,'annotations')]/o",
                 String.format(
-                    "/o[contains(@base,'seq.of1') and @name='annotations']/o/o[1][contains(@base,'string')]/o[text()='%s']",
+                    "/o[contains(@base,'seq.of1') and contains(@name,'annotations')]/o/o[1][contains(@base,'string')]/o[text()='%s']",
                     new DirectivesValue(annotation).hex()
                 ),
                 String.format(
-                    "/o[contains(@base,'seq.of1') and @name='annotations']/o/o[2][contains(@base,'bool')]/o[text()='%s']",
+                    "/o[contains(@base,'seq.of1') and contains(@name,'annotations')]/o/o[2][contains(@base,'bool')]/o[text()='%s']",
                     new DirectivesValue(true).hex()
                 )
             )
diff --git a/src/test/java/org/eolang/jeo/representation/directives/DirectivesClassPropertiesTest.java b/src/test/java/org/eolang/jeo/representation/directives/DirectivesClassPropertiesTest.java
index 3cc01fc90..1e03a60d3 100644
--- a/src/test/java/org/eolang/jeo/representation/directives/DirectivesClassPropertiesTest.java
+++ b/src/test/java/org/eolang/jeo/representation/directives/DirectivesClassPropertiesTest.java
@@ -23,7 +23,7 @@
  */
 package org.eolang.jeo.representation.directives;
 
-import org.eolang.jeo.matchers.SameXml;
+import com.jcabi.matchers.XhtmlMatchers;
 import org.hamcrest.MatcherAssert;
 import org.junit.jupiter.api.Test;
 import org.xembly.Directives;
@@ -32,7 +32,6 @@
 
 /**
  * Test case for {@link org.eolang.jeo.representation.directives.DirectivesClassProperties}.
- *
  * @since 0.1.0
  */
 final class DirectivesClassPropertiesTest {
@@ -53,22 +52,13 @@ void createsDirectives() throws ImpossibleModificationException {
                         )
                     ).up()
             ).xml(),
-            new SameXml(
-                String.join(
-                    "",
-                    "<?xml version='1.0' encoding='UTF-8'?>\n",
-                    "<o>\n",
-                    "   <o base='jeo.int' name='version'><o base='org.eolang.bytes'>00-00-00-00-00-00-00-34</o></o>\n",
-                    "   <o base='jeo.int' name='access'><o base='org.eolang.bytes'>00-00-00-00-00-00-00-01</o></o>\n",
-                    "   <o base='org.eolang.string' name='signature'><o base='org.eolang.bytes'>6F-72-67-2F-65-6F-6C-61-6E-67-2F-53-6F-6D-65-43-6C-61-73-73</o></o>\n",
-                    "   <o base='org.eolang.string' name='supername'><o base='org.eolang.bytes'>6A-61-76-61-2F-6C-61-6E-67-2F-4F-62-6A-65-63-74</o></o>\n",
-                    "   <o base='jeo.seq.of1' name='interfaces'>\n",
-                    "      <o base='org.eolang.string'><o base='org.eolang.bytes'>6F-72-67-2F-65-6F-6C-61-6E-67-2F-53-6F-6D-65-49-6E-74-65-72-66-61-63-65</o></o>\n",
-                    "   </o>\n",
-                    "</o>\n"
-                )
+            XhtmlMatchers.hasXPaths(
+                "/o/o[contains(@base,'jeo.int') and contains(@name,'version')]",
+                "/o/o[contains(@base,'jeo.int') and contains(@name,'access')]",
+                "/o/o[contains(@base,'org.eolang.string') and contains(@name,'signature')]",
+                "/o/o[contains(@base,'org.eolang.string') and contains(@name,'supername')]",
+                "/o/o[contains(@base,'jeo.seq.of1') and contains(@name,'interfaces')]"
             )
         );
     }
-
 }
diff --git a/src/test/java/org/eolang/jeo/representation/directives/DirectivesClassTest.java b/src/test/java/org/eolang/jeo/representation/directives/DirectivesClassTest.java
index a96d51cc4..06592c479 100644
--- a/src/test/java/org/eolang/jeo/representation/directives/DirectivesClassTest.java
+++ b/src/test/java/org/eolang/jeo/representation/directives/DirectivesClassTest.java
@@ -25,7 +25,6 @@
 
 import com.jcabi.matchers.XhtmlMatchers;
 import com.jcabi.xml.XMLDocument;
-import org.eolang.jeo.matchers.SameXml;
 import org.eolang.jeo.representation.ClassName;
 import org.eolang.jeo.representation.bytecode.BytecodeClass;
 import org.eolang.jeo.representation.bytecode.BytecodeClassProperties;
@@ -52,19 +51,15 @@ void createsWithSimpleConstructor() throws ImpossibleModificationException {
                 new DirectivesClass(new ClassName("Neo"), new DirectivesClassProperties()),
                 new Transformers.Node()
             ).xml(),
-            new SameXml(
-                String.join(
-                    "",
-                    "<o abstract='' name='Neo'>",
-                    "<o base='jeo.int' name='version'><o base='org.eolang.bytes'>00-00-00-00-00-00-00-34</o></o>",
-                    "<o base='jeo.int' name='access'><o base='org.eolang.bytes'>00-00-00-00-00-00-00-00</o></o>",
-                    "<o base='org.eolang.string' name='signature'><o base='org.eolang.bytes'>--</o></o>",
-                    "<o base='org.eolang.string' name='supername'><o base='org.eolang.bytes'>--</o></o>",
-                    "<o base='jeo.seq.of0' name='interfaces'/>",
-                    "<o base='jeo.seq.of0' name='annotations'/>",
-                    "<o base='jeo.seq.of0' name='attributes'/>",
-                    "</o>"
-                )
+            XhtmlMatchers.hasXPaths(
+                "/o[@name='Neo']",
+                "/o[@name='Neo']/o[contains(@name,'version')]",
+                "/o[@name='Neo']/o[contains(@name,'access')]",
+                "/o[@name='Neo']/o[contains(@name,'signature')]",
+                "/o[@name='Neo']/o[contains(@name,'supername')]",
+                "/o[@name='Neo']/o[contains(@name,'interfaces')]",
+                "/o[@name='Neo']/o[contains(@name,'annotations')]",
+                "/o[@name='Neo']/o[contains(@name,'attributes')]"
             )
         );
     }
diff --git a/src/test/java/org/eolang/jeo/representation/directives/DirectivesMetasTest.java b/src/test/java/org/eolang/jeo/representation/directives/DirectivesMetasTest.java
index 6381bd4c4..e840e99d2 100644
--- a/src/test/java/org/eolang/jeo/representation/directives/DirectivesMetasTest.java
+++ b/src/test/java/org/eolang/jeo/representation/directives/DirectivesMetasTest.java
@@ -25,12 +25,9 @@
 
 import com.jcabi.matchers.XhtmlMatchers;
 import org.eolang.jeo.representation.ClassName;
-import org.eolang.jeo.representation.bytecode.BytecodeClass;
-import org.eolang.jeo.representation.bytecode.BytecodeProgram;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.Test;
-import org.xembly.ImpossibleModificationException;
 import org.xembly.Transformers;
 import org.xembly.Xembler;
 
@@ -56,25 +53,6 @@ void createsMetasWithPackage() {
         );
     }
 
-    @Test
-    void addsAliasesForAllTheRequiredObjects() throws ImpossibleModificationException {
-        MatcherAssert.assertThat(
-            "Can't create corresponding xembly directives for all the required objects",
-            new Xembler(
-                new BytecodeProgram(new BytecodeClass().helloWorldMethod()).directives("")
-            ).xml(),
-            Matchers.allOf(
-                XhtmlMatchers.hasXPath("/program/metas/meta/head[text()='alias']"),
-                XhtmlMatchers.hasXPath("/program/metas/meta/tail[text()='jeo.opcode.return']"),
-                XhtmlMatchers.hasXPath("/program/metas/meta/tail[text()='jeo.label']"),
-                XhtmlMatchers.hasXPath("/program/metas/meta/part[text()='jeo.int']"),
-                XhtmlMatchers.hasXPath("/program/metas/meta/part[text()='jeo.bool']"),
-                XhtmlMatchers.hasXPath("/program/metas/meta/part[text()='jeo.param']"),
-                XhtmlMatchers.hasXPath("/program/metas/meta/part[text()='jeo.params']")
-            )
-        );
-    }
-
     @Test
     void addsNothingExceptPackage() {
         MatcherAssert.assertThat(
@@ -98,16 +76,11 @@ void addsNothingExceptPackage() {
     }
 
     @Test
-    void createsDirectivesWithEmptyPackage() throws ImpossibleModificationException {
+    void createsDirectivesWithEmptyPackage() {
         MatcherAssert.assertThat(
             "We expect that <metas>/<package> won't be created if package is empty",
-            new Xembler(
-                new DirectivesMetas(new ClassName("WithoutPackage")),
-                new Transformers.Node()
-            ).xml(),
-            Matchers.not(
-                XhtmlMatchers.hasXPath("/metas/meta/head[text()='package']")
-            )
+            new DirectivesMetas(new ClassName("WithoutPackage")),
+            Matchers.emptyIterable()
         );
     }
 }
diff --git a/src/test/java/org/eolang/jeo/representation/directives/DirectivesSeqTest.java b/src/test/java/org/eolang/jeo/representation/directives/DirectivesSeqTest.java
index a70898102..66fec2a0e 100644
--- a/src/test/java/org/eolang/jeo/representation/directives/DirectivesSeqTest.java
+++ b/src/test/java/org/eolang/jeo/representation/directives/DirectivesSeqTest.java
@@ -51,9 +51,9 @@ void convertsToNumberedSeq() throws ImpossibleModificationException {
                 )
             ).xml(),
             XhtmlMatchers.hasXPaths(
-                "/o[contains(@base,'seq.of2') and @name='@']",
-                "/o[contains(@base,'seq.of2') and @name='@']/o[contains(@base,'string')]/o[@base='org.eolang.bytes' and text()='31-']",
-                "/o[contains(@base,'seq.of2') and @name='@']/o[contains(@base,'string')]/o[@base='org.eolang.bytes' and text()='32-']"
+                "/o[contains(@base,'seq.of2') and contains(@name,'seq')]",
+                "/o[contains(@base,'seq.of2') and contains(@name,'seq')]/o[contains(@base,'string')]/o[@base='org.eolang.bytes' and text()='31-']",
+                "/o[contains(@base,'seq.of2') and contains(@name,'seq')]/o[contains(@base,'string')]/o[@base='org.eolang.bytes' and text()='32-']"
             )
         );
     }
@@ -68,7 +68,7 @@ void computesSize(
             new Xembler(actual).xml(),
             XhtmlMatchers.hasXPath(
                 String.format(
-                    "/o[contains(@base,'seq.of%d') and @name='@']",
+                    "/o[contains(@base,'seq.of%d') and contains(@name,'seq')]",
                     expected
                 )
             )
diff --git a/src/test/java/org/eolang/jeo/representation/directives/DirectivesValuesTest.java b/src/test/java/org/eolang/jeo/representation/directives/DirectivesValuesTest.java
index 4d8f38ccd..a7fd4d00d 100644
--- a/src/test/java/org/eolang/jeo/representation/directives/DirectivesValuesTest.java
+++ b/src/test/java/org/eolang/jeo/representation/directives/DirectivesValuesTest.java
@@ -44,8 +44,8 @@ void convertsToXmir() throws ImpossibleModificationException {
             "We expect that array of values will be converted to correct Xembly directives",
             new Xembler(new DirectivesValues("name", "value")).xml(),
             XhtmlMatchers.hasXPaths(
-                "./o[contains(@base,'seq.of1') and @name='name']",
-                "./o[contains(@base,'seq.of1') and @name='name']/o/o[@base='org.eolang.bytes' and text()='76-61-6C-75-65']"
+                "./o[contains(@base,'seq.of1') and contains(@name,'name')]",
+                "./o[contains(@base,'seq.of1') and contains(@name,'name')]/o/o[@base='org.eolang.bytes' and text()='76-61-6C-75-65']"
             )
         );
     }
diff --git a/src/test/java/org/eolang/jeo/representation/directives/HasMethod.java b/src/test/java/org/eolang/jeo/representation/directives/HasMethod.java
index 1a479b23e..8ca4174e8 100644
--- a/src/test/java/org/eolang/jeo/representation/directives/HasMethod.java
+++ b/src/test/java/org/eolang/jeo/representation/directives/HasMethod.java
@@ -204,7 +204,7 @@ private Stream<String> parameters() {
         return this.params.stream()
             .map(
                 param -> String.format(
-                    "%s/o[contains(@base,'params')]/o[@name='%s' and contains(@base,'param')]/@name",
+                    "%s/o[contains(@base,'params')]/o[contains(@name,'%s') and contains(@base,'param')]/@name",
                     root,
                     param
                 )
@@ -247,7 +247,7 @@ private Stream<String> labels() {
      */
     private String root() {
         return String.format(
-            "/program/objects/o[@name='%s']/o[contains(@name,'%s')]",
+            "/program/objects/o[contains(@name,'%s')]/o[contains(@name,'%s')]",
             this.clazz,
             this.name
         );
@@ -296,7 +296,7 @@ private static final class HasInstruction {
          */
         Stream<String> checks(final String root) {
             final String instruction = String.format(
-                "%s/o[contains(@base,'seq') and @name='@']/o[contains(@base,'opcode')]",
+                "%s/o[contains(@base,'seq') and contains(@name,'body')]/o[contains(@base,'opcode')]",
                 root
             );
             return Stream.concat(
@@ -420,7 +420,7 @@ private static final class HasLabel {
         static Stream<String> checks(final String root) {
             return Stream.of(
                 String.format(
-                    "%s/o[contains(@base,'seq') and @name='@']/o[contains(@base,'label')]/o[@base='org.eolang.bytes']/@base",
+                    "%s/o[contains(@base,'seq') and contains(@name,'body')]/o[contains(@base,'label')]/o[@base='org.eolang.bytes']/@base",
                     root
                 )
             );
diff --git a/src/test/java/org/eolang/jeo/representation/xmir/XmlMethodTest.java b/src/test/java/org/eolang/jeo/representation/xmir/XmlMethodTest.java
index 50aa69941..1e6fb93f6 100644
--- a/src/test/java/org/eolang/jeo/representation/xmir/XmlMethodTest.java
+++ b/src/test/java/org/eolang/jeo/representation/xmir/XmlMethodTest.java
@@ -109,7 +109,8 @@ void catchesMethodParsingException() {
                                 new BytecodeMethod(
                                     "someMethodName"
                                 ).directives()
-                            ).xpath(".//o[@name='exceptions']").append(new DirectivesBytes("???"))
+                            ).xpath(".//o[contains(@name, 'body')]")
+                                .append(new DirectivesBytes("???"))
                         ).xmlQuietly()
                     )
                 ).bytecode()