diff --git a/elements/Circle.js b/elements/Circle.js
index 0e333f2e..7ba82ca0 100644
--- a/elements/Circle.js
+++ b/elements/Circle.js
@@ -3,7 +3,7 @@ import { requireNativeComponent } from "react-native";
 import extractProps from "../lib/extract/extractProps";
 import Shape from "./Shape";
 
-export default class extends Shape {
+export default class Circle extends Shape {
     static displayName = "Circle";
 
     static defaultProps = {
diff --git a/elements/ClipPath.js b/elements/ClipPath.js
index f68e2914..320170ff 100644
--- a/elements/ClipPath.js
+++ b/elements/ClipPath.js
@@ -2,7 +2,7 @@ import React, { Component } from "react";
 import { requireNativeComponent } from "react-native";
 import extractClipPath from "../lib/extract/extractClipPath";
 
-export default class extends Component {
+export default class ClipPath extends Component {
     static displayName = "ClipPath";
 
     setNativeProps = (...args) => {
diff --git a/elements/Defs.js b/elements/Defs.js
index 227c1116..bfccf3e4 100644
--- a/elements/Defs.js
+++ b/elements/Defs.js
@@ -1,7 +1,7 @@
 import React, { Component } from "react";
 import { requireNativeComponent } from "react-native";
 
-export default class extends Component {
+export default class Defs extends Component {
     static displayName = "Defs";
 
     render() {
diff --git a/elements/Ellipse.js b/elements/Ellipse.js
index 2a691c2f..cc21d097 100644
--- a/elements/Ellipse.js
+++ b/elements/Ellipse.js
@@ -3,7 +3,7 @@ import { requireNativeComponent } from "react-native";
 import extractProps from "../lib/extract/extractProps";
 import Shape from "./Shape";
 
-export default class extends Shape {
+export default class Ellipse extends Shape {
     static displayName = "Ellipse";
 
     static defaultProps = {
diff --git a/elements/G.js b/elements/G.js
index 4071b118..e5e0591a 100644
--- a/elements/G.js
+++ b/elements/G.js
@@ -5,7 +5,7 @@ import { extractFont } from "../lib/extract/extractText";
 import extractTransform from "../lib/extract/extractTransform";
 import Shape from "./Shape";
 
-export default class extends Shape {
+export default class G extends Shape {
     static displayName = "G";
 
     setNativeProps = props => {
diff --git a/elements/Image.js b/elements/Image.js
index 27f46b55..700952ff 100644
--- a/elements/Image.js
+++ b/elements/Image.js
@@ -6,7 +6,7 @@ import Shape from "./Shape";
 
 const spacesRegExp = /\s+/;
 
-export default class extends Shape {
+export default class Image extends Shape {
     static displayName = "Image";
 
     static defaultProps = {
diff --git a/elements/Line.js b/elements/Line.js
index 2b156d95..d61ff408 100644
--- a/elements/Line.js
+++ b/elements/Line.js
@@ -3,7 +3,7 @@ import { requireNativeComponent } from "react-native";
 import extractProps from "../lib/extract/extractProps";
 import Shape from "./Shape";
 
-export default class extends Shape {
+export default class Line extends Shape {
     static displayName = "Line";
 
     static defaultProps = {
diff --git a/elements/LinearGradient.js b/elements/LinearGradient.js
index 15b5ed1f..94d0c860 100644
--- a/elements/LinearGradient.js
+++ b/elements/LinearGradient.js
@@ -2,7 +2,7 @@ import React, { Component } from "react";
 import { requireNativeComponent } from "react-native";
 import extractGradient from "../lib/extract/extractGradient";
 
-export default class extends Component {
+export default class LinearGradient extends Component {
     static displayName = "LinearGradient";
 
     static defaultProps = {
diff --git a/elements/Mask.js b/elements/Mask.js
index a5b21bcf..b8737401 100644
--- a/elements/Mask.js
+++ b/elements/Mask.js
@@ -3,7 +3,7 @@ import { requireNativeComponent } from "react-native";
 import extractTransform from "../lib/extract/extractTransform";
 import units from "../lib/units";
 
-export default class extends Component {
+export default class Mask extends Component {
     static displayName = "Mask";
 
     setNativeProps = props => {
diff --git a/elements/Path.js b/elements/Path.js
index 6d640cca..3ad55404 100644
--- a/elements/Path.js
+++ b/elements/Path.js
@@ -3,7 +3,7 @@ import { requireNativeComponent } from "react-native";
 import extractProps from "../lib/extract/extractProps";
 import Shape from "./Shape";
 
-export default class extends Shape {
+export default class Path extends Shape {
     static displayName = "Path";
 
     setNativeProps = (...args) => {
diff --git a/elements/Pattern.js b/elements/Pattern.js
index 1280cfb0..3c2d0d74 100644
--- a/elements/Pattern.js
+++ b/elements/Pattern.js
@@ -4,7 +4,7 @@ import extractTransform from "../lib/extract/extractTransform";
 import extractViewBox from "../lib/extract/extractViewBox";
 import units from "../lib/units";
 
-export default class extends Component {
+export default class Pattern extends Component {
     static displayName = "Pattern";
 
     setNativeProps = props => {
diff --git a/elements/Polygon.js b/elements/Polygon.js
index 5703ebbb..78ec9e9b 100644
--- a/elements/Polygon.js
+++ b/elements/Polygon.js
@@ -3,7 +3,7 @@ import Path from "./Path";
 import Shape from "./Shape";
 import extractPolyPoints from "../lib/extract/extractPolyPoints";
 
-export default class extends Shape {
+export default class Polygon extends Shape {
     static displayName = "Polygon";
 
     static defaultProps = {
diff --git a/elements/Polyline.js b/elements/Polyline.js
index 25468203..400522d0 100644
--- a/elements/Polyline.js
+++ b/elements/Polyline.js
@@ -3,7 +3,7 @@ import Path from "./Path";
 import Shape from "./Shape";
 import extractPolyPoints from "../lib/extract/extractPolyPoints";
 
-export default class extends Shape {
+export default class Polyline extends Shape {
     static displayName = "Polyline";
 
     static defaultProps = {
diff --git a/elements/RadialGradient.js b/elements/RadialGradient.js
index 41665fd9..5b07ee47 100644
--- a/elements/RadialGradient.js
+++ b/elements/RadialGradient.js
@@ -2,7 +2,7 @@ import React, { Component } from "react";
 import { requireNativeComponent } from "react-native";
 import extractGradient from "../lib/extract/extractGradient";
 
-export default class extends Component {
+export default class RadialGradient extends Component {
     static displayName = "RadialGradient";
 
     static defaultProps = {
diff --git a/elements/Rect.js b/elements/Rect.js
index 242dcfcf..4a0208e2 100644
--- a/elements/Rect.js
+++ b/elements/Rect.js
@@ -3,7 +3,7 @@ import { requireNativeComponent } from "react-native";
 import extractProps from "../lib/extract/extractProps";
 import Shape from "./Shape";
 
-export default class extends Shape {
+export default class Rect extends Shape {
     static displayName = "Rect";
 
     static defaultProps = {
diff --git a/elements/Shape.js b/elements/Shape.js
index b4251e1f..293dc1b9 100644
--- a/elements/Shape.js
+++ b/elements/Shape.js
@@ -3,7 +3,7 @@ import SvgTouchableMixin from "../lib/SvgTouchableMixin";
 
 const touch = Object.entries(SvgTouchableMixin);
 
-class Shape extends Component {
+export default class Shape extends Component {
     constructor() {
         super(...arguments);
         for (const [key, val] of touch) {
@@ -16,5 +16,3 @@ class Shape extends Component {
         this.state = this.touchableGetInitialState();
     }
 }
-
-export default Shape;
diff --git a/elements/Stop.js b/elements/Stop.js
index c9c7cf08..efb7a9c2 100644
--- a/elements/Stop.js
+++ b/elements/Stop.js
@@ -1,6 +1,6 @@
 import { Component } from "react";
 
-export default class extends Component {
+export default class Stop extends Component {
     static displayName = "Stop";
 
     static defaultProps = {
diff --git a/elements/Svg.js b/elements/Svg.js
index e9494a07..6ce16e54 100644
--- a/elements/Svg.js
+++ b/elements/Svg.js
@@ -19,7 +19,7 @@ const styles = StyleSheet.create({
     },
 });
 
-class Svg extends Shape {
+export default class Svg extends Shape {
     static displayName = "Svg";
 
     static defaultProps = {
@@ -141,5 +141,3 @@ class Svg extends Shape {
 }
 
 const NativeSvgView = requireNativeComponent("RNSVGSvgView");
-
-export default Svg;
diff --git a/elements/Symbol.js b/elements/Symbol.js
index 1cdfde95..5d799711 100644
--- a/elements/Symbol.js
+++ b/elements/Symbol.js
@@ -2,7 +2,7 @@ import React, { Component } from "react";
 import { requireNativeComponent } from "react-native";
 import extractViewBox from "../lib/extract/extractViewBox";
 
-export default class extends Component {
+export default class Symbol extends Component {
     static displayName = "Symbol";
 
     render() {
diff --git a/elements/Text.js b/elements/Text.js
index ac08aadd..183d8c27 100644
--- a/elements/Text.js
+++ b/elements/Text.js
@@ -7,7 +7,7 @@ import { pickNotNil } from "../lib/util";
 import Shape from "./Shape";
 import "./TSpan";
 
-export default class extends Shape {
+export default class Text extends Shape {
     static displayName = "Text";
 
     setNativeProps = props => {
diff --git a/elements/TextPath.js b/elements/TextPath.js
index df3fa45e..7fb46a1a 100644
--- a/elements/TextPath.js
+++ b/elements/TextPath.js
@@ -7,7 +7,7 @@ import { idPattern, pickNotNil } from "../lib/util";
 import Shape from "./Shape";
 import TSpan from "./TSpan";
 
-export default class extends Shape {
+export default class TextPath extends Shape {
     static displayName = "TextPath";
 
     setNativeProps = props => {
diff --git a/elements/Use.js b/elements/Use.js
index eef04e8e..e777678d 100644
--- a/elements/Use.js
+++ b/elements/Use.js
@@ -4,7 +4,7 @@ import extractProps from "../lib/extract/extractProps";
 import { idPattern } from "../lib/util";
 import Shape from "./Shape";
 
-export default class extends Shape {
+export default class Use extends Shape {
     static displayName = "Use";
 
     static defaultProps = {