diff --git a/NAMESPACE b/NAMESPACE
index 58d69df3..c0037ed5 100644
--- a/NAMESPACE
+++ b/NAMESPACE
@@ -33,7 +33,7 @@ export(AestheticSelectionKeys)
 export(AggregationInput)
 export(AggregationSummary)
 export(Alignments)
-export(Atoms)
+export(AtomPlots)
 export(AxisConfiguration)
 export(BackgroundConfiguration)
 export(BackgroundElement)
@@ -61,7 +61,7 @@ export(LegendPositions)
 export(LegendTypes)
 export(LineElement)
 export(Linetypes)
-export(Molecules)
+export(MoleculePlots)
 export(ObsVsPredDataMapping)
 export(ObsVsPredPlotConfiguration)
 export(ObservedDataMapping)
diff --git a/R/themes.R b/R/themes.R
index 26078702..16a7e2a5 100644
--- a/R/themes.R
+++ b/R/themes.R
@@ -363,7 +363,7 @@ ThemePlotConfigurations <- R6::R6Class(
                           addErrorbar = NULL,
                           ...) {
       # Validate necessary input
-      atomPlotInputs <- as.character(setdiff(Atoms, "initializePlot"))
+      atomPlotInputs <- as.character(setdiff(AtomPlots, "initializePlot"))
       validateExpressions <- parse(text = paste0("validateIsOfType(", atomPlotInputs, ", 'ThemeAestheticSelections', nullAllowed = TRUE)"))
       eval(validateExpressions)
 
@@ -376,7 +376,7 @@ ThemePlotConfigurations <- R6::R6Class(
       # Aesthetics for molecule plots
       # This allows also user defined molecule plots
       userMoleculePlots <- list(...)
-      moleculePlotInputs <- union(names(userMoleculePlots), as.character(Molecules))
+      moleculePlotInputs <- union(names(userMoleculePlots), as.character(MoleculePlots))
 
       for (molecule in moleculePlotInputs) {
         # Empty list if not defined by user
diff --git a/R/utilities-enums.R b/R/utilities-enums.R
index 19eea47c..5f4a8d02 100644
--- a/R/utilities-enums.R
+++ b/R/utilities-enums.R
@@ -47,21 +47,21 @@ AestheticFields <- enum(c(
   "errorbars"
 ))
 
-#' @title Atoms
+#' @title AtomPlots
 #' @import ospsuite.utils
 #' @export
 #' @description
 #' List of all available atom plots
 #' @family enum helpers
-Atoms <- enum(c(.getTitlesFromFamilyTag("atom plots")))
+AtomPlots <- enum(c(.getTitlesFromFamilyTag("atom plots")))
 
-#' @title Molecules
+#' @title MoleculePlots
 #' @import ospsuite.utils
 #' @export
 #' @description
 #' List of all available molecule plots
 #' @family enum helpers
-Molecules <- enum(c(.getTitlesFromFamilyTag("molecule plots")))
+MoleculePlots <- enum(c(.getTitlesFromFamilyTag("molecule plots")))
 
 #' @title PlotConfigurations
 #' @import ospsuite.utils
diff --git a/man/AestheticFields.Rd b/man/AestheticFields.Rd
index e397b45c..7067210d 100644
--- a/man/AestheticFields.Rd
+++ b/man/AestheticFields.Rd
@@ -17,7 +17,7 @@ List of all available aesthetic fields that manage aesthetic properties
 Other enum helpers: 
 \code{\link{AestheticProperties}},
 \code{\link{Alignments}},
-\code{\link{Atoms}},
+\code{\link{AtomPlots}},
 \code{\link{DataMappings}},
 \code{\link{ExportFormats}},
 \code{\link{ExportUnits}},
@@ -25,7 +25,7 @@ Other enum helpers:
 \code{\link{HorizontalJustification}},
 \code{\link{LegendPositions}},
 \code{\link{Linetypes}},
-\code{\link{Molecules}},
+\code{\link{MoleculePlots}},
 \code{\link{PlotAnnotationTextSize}},
 \code{\link{PlotConfigurations}},
 \code{\link{Scaling}},
diff --git a/man/AestheticProperties.Rd b/man/AestheticProperties.Rd
index 26bb9b99..6ab7d020 100644
--- a/man/AestheticProperties.Rd
+++ b/man/AestheticProperties.Rd
@@ -17,7 +17,7 @@ Enum of aesthetic property names of \code{ggplot2}
 Other enum helpers: 
 \code{\link{AestheticFields}},
 \code{\link{Alignments}},
-\code{\link{Atoms}},
+\code{\link{AtomPlots}},
 \code{\link{DataMappings}},
 \code{\link{ExportFormats}},
 \code{\link{ExportUnits}},
@@ -25,7 +25,7 @@ Other enum helpers:
 \code{\link{HorizontalJustification}},
 \code{\link{LegendPositions}},
 \code{\link{Linetypes}},
-\code{\link{Molecules}},
+\code{\link{MoleculePlots}},
 \code{\link{PlotAnnotationTextSize}},
 \code{\link{PlotConfigurations}},
 \code{\link{Scaling}},
diff --git a/man/Alignments.Rd b/man/Alignments.Rd
index ac922134..bfffb2f5 100644
--- a/man/Alignments.Rd
+++ b/man/Alignments.Rd
@@ -17,7 +17,7 @@ List of all available alignments/justifications for fonts
 Other enum helpers: 
 \code{\link{AestheticFields}},
 \code{\link{AestheticProperties}},
-\code{\link{Atoms}},
+\code{\link{AtomPlots}},
 \code{\link{DataMappings}},
 \code{\link{ExportFormats}},
 \code{\link{ExportUnits}},
@@ -25,7 +25,7 @@ Other enum helpers:
 \code{\link{HorizontalJustification}},
 \code{\link{LegendPositions}},
 \code{\link{Linetypes}},
-\code{\link{Molecules}},
+\code{\link{MoleculePlots}},
 \code{\link{PlotAnnotationTextSize}},
 \code{\link{PlotConfigurations}},
 \code{\link{Scaling}},
diff --git a/man/Atoms.Rd b/man/AtomPlots.Rd
similarity index 90%
rename from man/Atoms.Rd
rename to man/AtomPlots.Rd
index e4235386..1e1d66b7 100644
--- a/man/Atoms.Rd
+++ b/man/AtomPlots.Rd
@@ -1,14 +1,14 @@
 % Generated by roxygen2: do not edit by hand
 % Please edit documentation in R/utilities-enums.R
 \docType{data}
-\name{Atoms}
-\alias{Atoms}
-\title{Atoms}
+\name{AtomPlots}
+\alias{AtomPlots}
+\title{AtomPlots}
 \format{
 An object of class \code{list} of length 5.
 }
 \usage{
-Atoms
+AtomPlots
 }
 \description{
 List of all available atom plots
@@ -25,7 +25,7 @@ Other enum helpers:
 \code{\link{HorizontalJustification}},
 \code{\link{LegendPositions}},
 \code{\link{Linetypes}},
-\code{\link{Molecules}},
+\code{\link{MoleculePlots}},
 \code{\link{PlotAnnotationTextSize}},
 \code{\link{PlotConfigurations}},
 \code{\link{Scaling}},
diff --git a/man/BoxWhiskerDataMapping.Rd b/man/BoxWhiskerDataMapping.Rd
index c67b96a6..46183679 100644
--- a/man/BoxWhiskerDataMapping.Rd
+++ b/man/BoxWhiskerDataMapping.Rd
@@ -26,7 +26,7 @@ Other DataMapping classes:
 }
 \concept{DataMapping classes}
 \section{Super classes}{
-\code{\link[tlf:XYDataMapping]{tlf::XYDataMapping}} -> \code{\link[tlf:XYGDataMapping]{tlf::XYGDataMapping}} -> \code{BoxWhiskerDataMapping}
+\code{tlf::XYDataMapping} -> \code{tlf::XYGDataMapping} -> \code{BoxWhiskerDataMapping}
 }
 \section{Public fields}{
 \if{html}{\out{<div class="r6-fields">}}
diff --git a/man/BoxWhiskerPlotConfiguration.Rd b/man/BoxWhiskerPlotConfiguration.Rd
index f43acd9e..bc04f901 100644
--- a/man/BoxWhiskerPlotConfiguration.Rd
+++ b/man/BoxWhiskerPlotConfiguration.Rd
@@ -19,7 +19,7 @@ Other PlotConfiguration classes:
 }
 \concept{PlotConfiguration classes}
 \section{Super class}{
-\code{\link[tlf:PlotConfiguration]{tlf::PlotConfiguration}} -> \code{BoxWhiskerPlotConfiguration}
+\code{tlf::PlotConfiguration} -> \code{BoxWhiskerPlotConfiguration}
 }
 \section{Public fields}{
 \if{html}{\out{<div class="r6-fields">}}
diff --git a/man/DDIRatioDataMapping.Rd b/man/DDIRatioDataMapping.Rd
index 58098ac2..d0c9a89c 100644
--- a/man/DDIRatioDataMapping.Rd
+++ b/man/DDIRatioDataMapping.Rd
@@ -26,7 +26,7 @@ Other DataMapping classes:
 }
 \concept{DataMapping classes}
 \section{Super classes}{
-\code{\link[tlf:XYDataMapping]{tlf::XYDataMapping}} -> \code{\link[tlf:XYGDataMapping]{tlf::XYGDataMapping}} -> \code{\link[tlf:PKRatioDataMapping]{tlf::PKRatioDataMapping}} -> \code{DDIRatioDataMapping}
+\code{tlf::XYDataMapping} -> \code{tlf::XYGDataMapping} -> \code{tlf::PKRatioDataMapping} -> \code{DDIRatioDataMapping}
 }
 \section{Public fields}{
 \if{html}{\out{<div class="r6-fields">}}
diff --git a/man/DDIRatioPlotConfiguration.Rd b/man/DDIRatioPlotConfiguration.Rd
index 807e52f5..474869b0 100644
--- a/man/DDIRatioPlotConfiguration.Rd
+++ b/man/DDIRatioPlotConfiguration.Rd
@@ -19,7 +19,7 @@ Other PlotConfiguration classes:
 }
 \concept{PlotConfiguration classes}
 \section{Super class}{
-\code{\link[tlf:PlotConfiguration]{tlf::PlotConfiguration}} -> \code{DDIRatioPlotConfiguration}
+\code{tlf::PlotConfiguration} -> \code{DDIRatioPlotConfiguration}
 }
 \section{Public fields}{
 \if{html}{\out{<div class="r6-fields">}}
diff --git a/man/DataMappings.Rd b/man/DataMappings.Rd
index 4395d03f..5f6db8ea 100644
--- a/man/DataMappings.Rd
+++ b/man/DataMappings.Rd
@@ -18,14 +18,14 @@ Other enum helpers:
 \code{\link{AestheticFields}},
 \code{\link{AestheticProperties}},
 \code{\link{Alignments}},
-\code{\link{Atoms}},
+\code{\link{AtomPlots}},
 \code{\link{ExportFormats}},
 \code{\link{ExportUnits}},
 \code{\link{FontFaces}},
 \code{\link{HorizontalJustification}},
 \code{\link{LegendPositions}},
 \code{\link{Linetypes}},
-\code{\link{Molecules}},
+\code{\link{MoleculePlots}},
 \code{\link{PlotAnnotationTextSize}},
 \code{\link{PlotConfigurations}},
 \code{\link{Scaling}},
diff --git a/man/ExportFormats.Rd b/man/ExportFormats.Rd
index 2797e15a..6ae0095f 100644
--- a/man/ExportFormats.Rd
+++ b/man/ExportFormats.Rd
@@ -18,14 +18,14 @@ Other enum helpers:
 \code{\link{AestheticFields}},
 \code{\link{AestheticProperties}},
 \code{\link{Alignments}},
-\code{\link{Atoms}},
+\code{\link{AtomPlots}},
 \code{\link{DataMappings}},
 \code{\link{ExportUnits}},
 \code{\link{FontFaces}},
 \code{\link{HorizontalJustification}},
 \code{\link{LegendPositions}},
 \code{\link{Linetypes}},
-\code{\link{Molecules}},
+\code{\link{MoleculePlots}},
 \code{\link{PlotAnnotationTextSize}},
 \code{\link{PlotConfigurations}},
 \code{\link{Scaling}},
diff --git a/man/ExportUnits.Rd b/man/ExportUnits.Rd
index 16a87733..80d4d526 100644
--- a/man/ExportUnits.Rd
+++ b/man/ExportUnits.Rd
@@ -18,14 +18,14 @@ Other enum helpers:
 \code{\link{AestheticFields}},
 \code{\link{AestheticProperties}},
 \code{\link{Alignments}},
-\code{\link{Atoms}},
+\code{\link{AtomPlots}},
 \code{\link{DataMappings}},
 \code{\link{ExportFormats}},
 \code{\link{FontFaces}},
 \code{\link{HorizontalJustification}},
 \code{\link{LegendPositions}},
 \code{\link{Linetypes}},
-\code{\link{Molecules}},
+\code{\link{MoleculePlots}},
 \code{\link{PlotAnnotationTextSize}},
 \code{\link{PlotConfigurations}},
 \code{\link{Scaling}},
diff --git a/man/FontFaces.Rd b/man/FontFaces.Rd
index d5627cda..bb29f6cf 100644
--- a/man/FontFaces.Rd
+++ b/man/FontFaces.Rd
@@ -18,14 +18,14 @@ Other enum helpers:
 \code{\link{AestheticFields}},
 \code{\link{AestheticProperties}},
 \code{\link{Alignments}},
-\code{\link{Atoms}},
+\code{\link{AtomPlots}},
 \code{\link{DataMappings}},
 \code{\link{ExportFormats}},
 \code{\link{ExportUnits}},
 \code{\link{HorizontalJustification}},
 \code{\link{LegendPositions}},
 \code{\link{Linetypes}},
-\code{\link{Molecules}},
+\code{\link{MoleculePlots}},
 \code{\link{PlotAnnotationTextSize}},
 \code{\link{PlotConfigurations}},
 \code{\link{Scaling}},
diff --git a/man/HistogramDataMapping.Rd b/man/HistogramDataMapping.Rd
index 627404f3..e592b6ea 100644
--- a/man/HistogramDataMapping.Rd
+++ b/man/HistogramDataMapping.Rd
@@ -26,7 +26,7 @@ Other DataMapping classes:
 }
 \concept{DataMapping classes}
 \section{Super classes}{
-\code{\link[tlf:XYDataMapping]{tlf::XYDataMapping}} -> \code{\link[tlf:XYGDataMapping]{tlf::XYGDataMapping}} -> \code{HistogramDataMapping}
+\code{tlf::XYDataMapping} -> \code{tlf::XYGDataMapping} -> \code{HistogramDataMapping}
 }
 \section{Public fields}{
 \if{html}{\out{<div class="r6-fields">}}
diff --git a/man/HistogramPlotConfiguration.Rd b/man/HistogramPlotConfiguration.Rd
index 44ba16ae..fabdba40 100644
--- a/man/HistogramPlotConfiguration.Rd
+++ b/man/HistogramPlotConfiguration.Rd
@@ -19,7 +19,7 @@ Other PlotConfiguration classes:
 }
 \concept{PlotConfiguration classes}
 \section{Super class}{
-\code{\link[tlf:PlotConfiguration]{tlf::PlotConfiguration}} -> \code{HistogramPlotConfiguration}
+\code{tlf::PlotConfiguration} -> \code{HistogramPlotConfiguration}
 }
 \section{Methods}{
 \subsection{Public methods}{
diff --git a/man/HorizontalJustification.Rd b/man/HorizontalJustification.Rd
index 3bf5359a..66001931 100644
--- a/man/HorizontalJustification.Rd
+++ b/man/HorizontalJustification.Rd
@@ -18,14 +18,14 @@ Other enum helpers:
 \code{\link{AestheticFields}},
 \code{\link{AestheticProperties}},
 \code{\link{Alignments}},
-\code{\link{Atoms}},
+\code{\link{AtomPlots}},
 \code{\link{DataMappings}},
 \code{\link{ExportFormats}},
 \code{\link{ExportUnits}},
 \code{\link{FontFaces}},
 \code{\link{LegendPositions}},
 \code{\link{Linetypes}},
-\code{\link{Molecules}},
+\code{\link{MoleculePlots}},
 \code{\link{PlotAnnotationTextSize}},
 \code{\link{PlotConfigurations}},
 \code{\link{Scaling}},
diff --git a/man/LegendPositions.Rd b/man/LegendPositions.Rd
index ad86718c..3aae85d6 100644
--- a/man/LegendPositions.Rd
+++ b/man/LegendPositions.Rd
@@ -18,14 +18,14 @@ Other enum helpers:
 \code{\link{AestheticFields}},
 \code{\link{AestheticProperties}},
 \code{\link{Alignments}},
-\code{\link{Atoms}},
+\code{\link{AtomPlots}},
 \code{\link{DataMappings}},
 \code{\link{ExportFormats}},
 \code{\link{ExportUnits}},
 \code{\link{FontFaces}},
 \code{\link{HorizontalJustification}},
 \code{\link{Linetypes}},
-\code{\link{Molecules}},
+\code{\link{MoleculePlots}},
 \code{\link{PlotAnnotationTextSize}},
 \code{\link{PlotConfigurations}},
 \code{\link{Scaling}},
diff --git a/man/LineElement.Rd b/man/LineElement.Rd
index debf3281..1008fbc5 100644
--- a/man/LineElement.Rd
+++ b/man/LineElement.Rd
@@ -7,7 +7,7 @@
 R6 class defining the properties of background line elements
 }
 \section{Super class}{
-\code{\link[tlf:BackgroundElement]{tlf::BackgroundElement}} -> \code{LineElement}
+\code{tlf::BackgroundElement} -> \code{LineElement}
 }
 \section{Methods}{
 \subsection{Public methods}{
diff --git a/man/Linetypes.Rd b/man/Linetypes.Rd
index 89813f5a..3d563cb9 100644
--- a/man/Linetypes.Rd
+++ b/man/Linetypes.Rd
@@ -18,14 +18,14 @@ Other enum helpers:
 \code{\link{AestheticFields}},
 \code{\link{AestheticProperties}},
 \code{\link{Alignments}},
-\code{\link{Atoms}},
+\code{\link{AtomPlots}},
 \code{\link{DataMappings}},
 \code{\link{ExportFormats}},
 \code{\link{ExportUnits}},
 \code{\link{FontFaces}},
 \code{\link{HorizontalJustification}},
 \code{\link{LegendPositions}},
-\code{\link{Molecules}},
+\code{\link{MoleculePlots}},
 \code{\link{PlotAnnotationTextSize}},
 \code{\link{PlotConfigurations}},
 \code{\link{Scaling}},
diff --git a/man/Molecules.Rd b/man/MoleculePlots.Rd
similarity index 89%
rename from man/Molecules.Rd
rename to man/MoleculePlots.Rd
index 95cd1b4a..7c0a7548 100644
--- a/man/Molecules.Rd
+++ b/man/MoleculePlots.Rd
@@ -1,14 +1,14 @@
 % Generated by roxygen2: do not edit by hand
 % Please edit documentation in R/utilities-enums.R
 \docType{data}
-\name{Molecules}
-\alias{Molecules}
-\title{Molecules}
+\name{MoleculePlots}
+\alias{MoleculePlots}
+\title{MoleculePlots}
 \format{
 An object of class \code{list} of length 10.
 }
 \usage{
-Molecules
+MoleculePlots
 }
 \description{
 List of all available molecule plots
@@ -18,7 +18,7 @@ Other enum helpers:
 \code{\link{AestheticFields}},
 \code{\link{AestheticProperties}},
 \code{\link{Alignments}},
-\code{\link{Atoms}},
+\code{\link{AtomPlots}},
 \code{\link{DataMappings}},
 \code{\link{ExportFormats}},
 \code{\link{ExportUnits}},
diff --git a/man/ObsVsPredDataMapping.Rd b/man/ObsVsPredDataMapping.Rd
index d622f4da..4aaefaae 100644
--- a/man/ObsVsPredDataMapping.Rd
+++ b/man/ObsVsPredDataMapping.Rd
@@ -26,7 +26,7 @@ Other DataMapping classes:
 }
 \concept{DataMapping classes}
 \section{Super classes}{
-\code{\link[tlf:XYDataMapping]{tlf::XYDataMapping}} -> \code{\link[tlf:XYGDataMapping]{tlf::XYGDataMapping}} -> \code{ObsVsPredDataMapping}
+\code{tlf::XYDataMapping} -> \code{tlf::XYGDataMapping} -> \code{ObsVsPredDataMapping}
 }
 \section{Public fields}{
 \if{html}{\out{<div class="r6-fields">}}
diff --git a/man/ObsVsPredPlotConfiguration.Rd b/man/ObsVsPredPlotConfiguration.Rd
index 15743048..16c72407 100644
--- a/man/ObsVsPredPlotConfiguration.Rd
+++ b/man/ObsVsPredPlotConfiguration.Rd
@@ -19,7 +19,7 @@ Other PlotConfiguration classes:
 }
 \concept{PlotConfiguration classes}
 \section{Super class}{
-\code{\link[tlf:PlotConfiguration]{tlf::PlotConfiguration}} -> \code{ObsVsPredPlotConfiguration}
+\code{tlf::PlotConfiguration} -> \code{ObsVsPredPlotConfiguration}
 }
 \section{Public fields}{
 \if{html}{\out{<div class="r6-fields">}}
diff --git a/man/ObservedDataMapping.Rd b/man/ObservedDataMapping.Rd
index 9b7772c4..0ed15ba3 100644
--- a/man/ObservedDataMapping.Rd
+++ b/man/ObservedDataMapping.Rd
@@ -26,7 +26,7 @@ Other DataMapping classes:
 }
 \concept{DataMapping classes}
 \section{Super classes}{
-\code{\link[tlf:XYDataMapping]{tlf::XYDataMapping}} -> \code{\link[tlf:XYGDataMapping]{tlf::XYGDataMapping}} -> \code{ObservedDataMapping}
+\code{tlf::XYDataMapping} -> \code{tlf::XYGDataMapping} -> \code{ObservedDataMapping}
 }
 \section{Public fields}{
 \if{html}{\out{<div class="r6-fields">}}
diff --git a/man/PKRatioDataMapping.Rd b/man/PKRatioDataMapping.Rd
index 87c312fd..4dd6a5e8 100644
--- a/man/PKRatioDataMapping.Rd
+++ b/man/PKRatioDataMapping.Rd
@@ -26,7 +26,7 @@ Other DataMapping classes:
 }
 \concept{DataMapping classes}
 \section{Super classes}{
-\code{\link[tlf:XYDataMapping]{tlf::XYDataMapping}} -> \code{\link[tlf:XYGDataMapping]{tlf::XYGDataMapping}} -> \code{PKRatioDataMapping}
+\code{tlf::XYDataMapping} -> \code{tlf::XYGDataMapping} -> \code{PKRatioDataMapping}
 }
 \section{Public fields}{
 \if{html}{\out{<div class="r6-fields">}}
diff --git a/man/PKRatioPlotConfiguration.Rd b/man/PKRatioPlotConfiguration.Rd
index a98c6afc..75c2f175 100644
--- a/man/PKRatioPlotConfiguration.Rd
+++ b/man/PKRatioPlotConfiguration.Rd
@@ -19,7 +19,7 @@ Other PlotConfiguration classes:
 }
 \concept{PlotConfiguration classes}
 \section{Super class}{
-\code{\link[tlf:PlotConfiguration]{tlf::PlotConfiguration}} -> \code{PKRatioPlotConfiguration}
+\code{tlf::PlotConfiguration} -> \code{PKRatioPlotConfiguration}
 }
 \section{Public fields}{
 \if{html}{\out{<div class="r6-fields">}}
diff --git a/man/PlotAnnotationTextSize.Rd b/man/PlotAnnotationTextSize.Rd
index 077140e0..f4d58d4c 100644
--- a/man/PlotAnnotationTextSize.Rd
+++ b/man/PlotAnnotationTextSize.Rd
@@ -18,7 +18,7 @@ Other enum helpers:
 \code{\link{AestheticFields}},
 \code{\link{AestheticProperties}},
 \code{\link{Alignments}},
-\code{\link{Atoms}},
+\code{\link{AtomPlots}},
 \code{\link{DataMappings}},
 \code{\link{ExportFormats}},
 \code{\link{ExportUnits}},
@@ -26,7 +26,7 @@ Other enum helpers:
 \code{\link{HorizontalJustification}},
 \code{\link{LegendPositions}},
 \code{\link{Linetypes}},
-\code{\link{Molecules}},
+\code{\link{MoleculePlots}},
 \code{\link{PlotConfigurations}},
 \code{\link{Scaling}},
 \code{\link{Shapes}},
diff --git a/man/PlotConfigurations.Rd b/man/PlotConfigurations.Rd
index 44cb6c6f..2548dd10 100644
--- a/man/PlotConfigurations.Rd
+++ b/man/PlotConfigurations.Rd
@@ -18,7 +18,7 @@ Other enum helpers:
 \code{\link{AestheticFields}},
 \code{\link{AestheticProperties}},
 \code{\link{Alignments}},
-\code{\link{Atoms}},
+\code{\link{AtomPlots}},
 \code{\link{DataMappings}},
 \code{\link{ExportFormats}},
 \code{\link{ExportUnits}},
@@ -26,7 +26,7 @@ Other enum helpers:
 \code{\link{HorizontalJustification}},
 \code{\link{LegendPositions}},
 \code{\link{Linetypes}},
-\code{\link{Molecules}},
+\code{\link{MoleculePlots}},
 \code{\link{PlotAnnotationTextSize}},
 \code{\link{Scaling}},
 \code{\link{Shapes}},
diff --git a/man/QQDataMapping.Rd b/man/QQDataMapping.Rd
index d69186ae..ad2db61d 100644
--- a/man/QQDataMapping.Rd
+++ b/man/QQDataMapping.Rd
@@ -26,7 +26,7 @@ Other DataMapping classes:
 }
 \concept{DataMapping classes}
 \section{Super classes}{
-\code{\link[tlf:XYDataMapping]{tlf::XYDataMapping}} -> \code{\link[tlf:XYGDataMapping]{tlf::XYGDataMapping}} -> \code{QQDataMapping}
+\code{tlf::XYDataMapping} -> \code{tlf::XYGDataMapping} -> \code{QQDataMapping}
 }
 \section{Methods}{
 \subsection{Public methods}{
diff --git a/man/QQPlotConfiguration.Rd b/man/QQPlotConfiguration.Rd
index 2ff7f2c8..6883311a 100644
--- a/man/QQPlotConfiguration.Rd
+++ b/man/QQPlotConfiguration.Rd
@@ -19,7 +19,7 @@ Other PlotConfiguration classes:
 }
 \concept{PlotConfiguration classes}
 \section{Super class}{
-\code{\link[tlf:PlotConfiguration]{tlf::PlotConfiguration}} -> \code{QQPlotConfiguration}
+\code{tlf::PlotConfiguration} -> \code{QQPlotConfiguration}
 }
 \section{Methods}{
 \subsection{Public methods}{
diff --git a/man/RangeDataMapping.Rd b/man/RangeDataMapping.Rd
index de8bac88..042fcffb 100644
--- a/man/RangeDataMapping.Rd
+++ b/man/RangeDataMapping.Rd
@@ -26,7 +26,7 @@ Other DataMapping classes:
 }
 \concept{DataMapping classes}
 \section{Super classes}{
-\code{\link[tlf:XYDataMapping]{tlf::XYDataMapping}} -> \code{\link[tlf:XYGDataMapping]{tlf::XYGDataMapping}} -> \code{RangeDataMapping}
+\code{tlf::XYDataMapping} -> \code{tlf::XYGDataMapping} -> \code{RangeDataMapping}
 }
 \section{Public fields}{
 \if{html}{\out{<div class="r6-fields">}}
diff --git a/man/ResVsPredDataMapping.Rd b/man/ResVsPredDataMapping.Rd
index 306d3b01..af83e46c 100644
--- a/man/ResVsPredDataMapping.Rd
+++ b/man/ResVsPredDataMapping.Rd
@@ -26,7 +26,7 @@ Other DataMapping classes:
 }
 \concept{DataMapping classes}
 \section{Super classes}{
-\code{\link[tlf:XYDataMapping]{tlf::XYDataMapping}} -> \code{\link[tlf:XYGDataMapping]{tlf::XYGDataMapping}} -> \code{\link[tlf:ObsVsPredDataMapping]{tlf::ObsVsPredDataMapping}} -> \code{ResVsPredDataMapping}
+\code{tlf::XYDataMapping} -> \code{tlf::XYGDataMapping} -> \code{tlf::ObsVsPredDataMapping} -> \code{ResVsPredDataMapping}
 }
 \section{Methods}{
 \subsection{Public methods}{
diff --git a/man/ResVsPredPlotConfiguration.Rd b/man/ResVsPredPlotConfiguration.Rd
index d6dc26e8..9edd31dc 100644
--- a/man/ResVsPredPlotConfiguration.Rd
+++ b/man/ResVsPredPlotConfiguration.Rd
@@ -7,7 +7,7 @@
 R6 class defining the configuration of a \code{ggplot} object for Res vs Pred/Time plots
 }
 \section{Super class}{
-\code{\link[tlf:PlotConfiguration]{tlf::PlotConfiguration}} -> \code{ResVsPredPlotConfiguration}
+\code{tlf::PlotConfiguration} -> \code{ResVsPredPlotConfiguration}
 }
 \section{Public fields}{
 \if{html}{\out{<div class="r6-fields">}}
diff --git a/man/ResVsTimeDataMapping.Rd b/man/ResVsTimeDataMapping.Rd
index 916c0e78..7e768f93 100644
--- a/man/ResVsTimeDataMapping.Rd
+++ b/man/ResVsTimeDataMapping.Rd
@@ -26,7 +26,7 @@ Other DataMapping classes:
 }
 \concept{DataMapping classes}
 \section{Super classes}{
-\code{\link[tlf:XYDataMapping]{tlf::XYDataMapping}} -> \code{\link[tlf:XYGDataMapping]{tlf::XYGDataMapping}} -> \code{\link[tlf:ObsVsPredDataMapping]{tlf::ObsVsPredDataMapping}} -> \code{\link[tlf:ResVsPredDataMapping]{tlf::ResVsPredDataMapping}} -> \code{ResVsTimeDataMapping}
+\code{tlf::XYDataMapping} -> \code{tlf::XYGDataMapping} -> \code{tlf::ObsVsPredDataMapping} -> \code{tlf::ResVsPredDataMapping} -> \code{ResVsTimeDataMapping}
 }
 \section{Methods}{
 \subsection{Public methods}{
diff --git a/man/ResVsTimePlotConfiguration.Rd b/man/ResVsTimePlotConfiguration.Rd
index 537fd32b..ba7b3832 100644
--- a/man/ResVsTimePlotConfiguration.Rd
+++ b/man/ResVsTimePlotConfiguration.Rd
@@ -7,7 +7,7 @@
 R6 class defining the configuration of a \code{ggplot} object for Res vs Pred/Time plots
 }
 \section{Super classes}{
-\code{\link[tlf:PlotConfiguration]{tlf::PlotConfiguration}} -> \code{\link[tlf:ResVsPredPlotConfiguration]{tlf::ResVsPredPlotConfiguration}} -> \code{ResVsTimePlotConfiguration}
+\code{tlf::PlotConfiguration} -> \code{tlf::ResVsPredPlotConfiguration} -> \code{ResVsTimePlotConfiguration}
 }
 \section{Methods}{
 \subsection{Public methods}{
diff --git a/man/Scaling.Rd b/man/Scaling.Rd
index 76066a1a..d3f813f6 100644
--- a/man/Scaling.Rd
+++ b/man/Scaling.Rd
@@ -48,7 +48,7 @@ Other enum helpers:
 \code{\link{AestheticFields}},
 \code{\link{AestheticProperties}},
 \code{\link{Alignments}},
-\code{\link{Atoms}},
+\code{\link{AtomPlots}},
 \code{\link{DataMappings}},
 \code{\link{ExportFormats}},
 \code{\link{ExportUnits}},
@@ -56,7 +56,7 @@ Other enum helpers:
 \code{\link{HorizontalJustification}},
 \code{\link{LegendPositions}},
 \code{\link{Linetypes}},
-\code{\link{Molecules}},
+\code{\link{MoleculePlots}},
 \code{\link{PlotAnnotationTextSize}},
 \code{\link{PlotConfigurations}},
 \code{\link{Shapes}},
diff --git a/man/Shapes.Rd b/man/Shapes.Rd
index 23f741c3..b3ab02cf 100644
--- a/man/Shapes.Rd
+++ b/man/Shapes.Rd
@@ -18,7 +18,7 @@ Other enum helpers:
 \code{\link{AestheticFields}},
 \code{\link{AestheticProperties}},
 \code{\link{Alignments}},
-\code{\link{Atoms}},
+\code{\link{AtomPlots}},
 \code{\link{DataMappings}},
 \code{\link{ExportFormats}},
 \code{\link{ExportUnits}},
@@ -26,7 +26,7 @@ Other enum helpers:
 \code{\link{HorizontalJustification}},
 \code{\link{LegendPositions}},
 \code{\link{Linetypes}},
-\code{\link{Molecules}},
+\code{\link{MoleculePlots}},
 \code{\link{PlotAnnotationTextSize}},
 \code{\link{PlotConfigurations}},
 \code{\link{Scaling}},
diff --git a/man/TagPositions.Rd b/man/TagPositions.Rd
index 23db2fc9..3b53bcef 100644
--- a/man/TagPositions.Rd
+++ b/man/TagPositions.Rd
@@ -18,7 +18,7 @@ Other enum helpers:
 \code{\link{AestheticFields}},
 \code{\link{AestheticProperties}},
 \code{\link{Alignments}},
-\code{\link{Atoms}},
+\code{\link{AtomPlots}},
 \code{\link{DataMappings}},
 \code{\link{ExportFormats}},
 \code{\link{ExportUnits}},
@@ -26,7 +26,7 @@ Other enum helpers:
 \code{\link{HorizontalJustification}},
 \code{\link{LegendPositions}},
 \code{\link{Linetypes}},
-\code{\link{Molecules}},
+\code{\link{MoleculePlots}},
 \code{\link{PlotAnnotationTextSize}},
 \code{\link{PlotConfigurations}},
 \code{\link{Scaling}},
diff --git a/man/ThemeAestheticSelections.Rd b/man/ThemeAestheticSelections.Rd
index 55f90af6..071aa959 100644
--- a/man/ThemeAestheticSelections.Rd
+++ b/man/ThemeAestheticSelections.Rd
@@ -7,7 +7,7 @@
 R6 class defining how plot configurations will use aesthetic maps
 }
 \section{Super class}{
-\code{\link[tlf:ThemeAestheticMaps]{tlf::ThemeAestheticMaps}} -> \code{ThemeAestheticSelections}
+\code{tlf::ThemeAestheticMaps} -> \code{ThemeAestheticSelections}
 }
 \section{Methods}{
 \subsection{Public methods}{
diff --git a/man/TickLabelTransforms.Rd b/man/TickLabelTransforms.Rd
index 7f7d61d1..7deb2c0a 100644
--- a/man/TickLabelTransforms.Rd
+++ b/man/TickLabelTransforms.Rd
@@ -18,7 +18,7 @@ Other enum helpers:
 \code{\link{AestheticFields}},
 \code{\link{AestheticProperties}},
 \code{\link{Alignments}},
-\code{\link{Atoms}},
+\code{\link{AtomPlots}},
 \code{\link{DataMappings}},
 \code{\link{ExportFormats}},
 \code{\link{ExportUnits}},
@@ -26,7 +26,7 @@ Other enum helpers:
 \code{\link{HorizontalJustification}},
 \code{\link{LegendPositions}},
 \code{\link{Linetypes}},
-\code{\link{Molecules}},
+\code{\link{MoleculePlots}},
 \code{\link{PlotAnnotationTextSize}},
 \code{\link{PlotConfigurations}},
 \code{\link{Scaling}},
diff --git a/man/TimeProfileDataMapping.Rd b/man/TimeProfileDataMapping.Rd
index 850b7e0c..96171497 100644
--- a/man/TimeProfileDataMapping.Rd
+++ b/man/TimeProfileDataMapping.Rd
@@ -26,7 +26,7 @@ Other DataMapping classes:
 }
 \concept{DataMapping classes}
 \section{Super classes}{
-\code{\link[tlf:XYDataMapping]{tlf::XYDataMapping}} -> \code{\link[tlf:XYGDataMapping]{tlf::XYGDataMapping}} -> \code{\link[tlf:RangeDataMapping]{tlf::RangeDataMapping}} -> \code{TimeProfileDataMapping}
+\code{tlf::XYDataMapping} -> \code{tlf::XYGDataMapping} -> \code{tlf::RangeDataMapping} -> \code{TimeProfileDataMapping}
 }
 \section{Methods}{
 \subsection{Public methods}{
diff --git a/man/TimeProfilePlotConfiguration.Rd b/man/TimeProfilePlotConfiguration.Rd
index e78d8bcb..d8cc1043 100644
--- a/man/TimeProfilePlotConfiguration.Rd
+++ b/man/TimeProfilePlotConfiguration.Rd
@@ -19,7 +19,7 @@ Other PlotConfiguration classes:
 }
 \concept{PlotConfiguration classes}
 \section{Super class}{
-\code{\link[tlf:PlotConfiguration]{tlf::PlotConfiguration}} -> \code{TimeProfilePlotConfiguration}
+\code{tlf::PlotConfiguration} -> \code{TimeProfilePlotConfiguration}
 }
 \section{Methods}{
 \subsection{Public methods}{
diff --git a/man/TornadoDataMapping.Rd b/man/TornadoDataMapping.Rd
index 269bdeea..083cea4f 100644
--- a/man/TornadoDataMapping.Rd
+++ b/man/TornadoDataMapping.Rd
@@ -26,7 +26,7 @@ Other DataMapping classes:
 }
 \concept{DataMapping classes}
 \section{Super classes}{
-\code{\link[tlf:XYDataMapping]{tlf::XYDataMapping}} -> \code{\link[tlf:XYGDataMapping]{tlf::XYGDataMapping}} -> \code{TornadoDataMapping}
+\code{tlf::XYDataMapping} -> \code{tlf::XYGDataMapping} -> \code{TornadoDataMapping}
 }
 \section{Public fields}{
 \if{html}{\out{<div class="r6-fields">}}
diff --git a/man/TornadoPlotConfiguration.Rd b/man/TornadoPlotConfiguration.Rd
index 182a8b91..04d8ec52 100644
--- a/man/TornadoPlotConfiguration.Rd
+++ b/man/TornadoPlotConfiguration.Rd
@@ -19,7 +19,7 @@ Other PlotConfiguration classes:
 }
 \concept{PlotConfiguration classes}
 \section{Super class}{
-\code{\link[tlf:PlotConfiguration]{tlf::PlotConfiguration}} -> \code{TornadoPlotConfiguration}
+\code{tlf::PlotConfiguration} -> \code{TornadoPlotConfiguration}
 }
 \section{Public fields}{
 \if{html}{\out{<div class="r6-fields">}}
diff --git a/man/VerticalJustification.Rd b/man/VerticalJustification.Rd
index 607bd635..7749d8e6 100644
--- a/man/VerticalJustification.Rd
+++ b/man/VerticalJustification.Rd
@@ -18,7 +18,7 @@ Other enum helpers:
 \code{\link{AestheticFields}},
 \code{\link{AestheticProperties}},
 \code{\link{Alignments}},
-\code{\link{Atoms}},
+\code{\link{AtomPlots}},
 \code{\link{DataMappings}},
 \code{\link{ExportFormats}},
 \code{\link{ExportUnits}},
@@ -26,7 +26,7 @@ Other enum helpers:
 \code{\link{HorizontalJustification}},
 \code{\link{LegendPositions}},
 \code{\link{Linetypes}},
-\code{\link{Molecules}},
+\code{\link{MoleculePlots}},
 \code{\link{PlotAnnotationTextSize}},
 \code{\link{PlotConfigurations}},
 \code{\link{Scaling}},
diff --git a/man/XAxisConfiguration.Rd b/man/XAxisConfiguration.Rd
index 6c293492..85382cfd 100644
--- a/man/XAxisConfiguration.Rd
+++ b/man/XAxisConfiguration.Rd
@@ -7,7 +7,7 @@
 R6 class defining the configuration of X-axis
 }
 \section{Super class}{
-\code{\link[tlf:AxisConfiguration]{tlf::AxisConfiguration}} -> \code{XAxisConfiguration}
+\code{tlf::AxisConfiguration} -> \code{XAxisConfiguration}
 }
 \section{Methods}{
 \subsection{Public methods}{
diff --git a/man/XYGDataMapping.Rd b/man/XYGDataMapping.Rd
index d2126d86..917c81ef 100644
--- a/man/XYGDataMapping.Rd
+++ b/man/XYGDataMapping.Rd
@@ -26,7 +26,7 @@ Other DataMapping classes:
 }
 \concept{DataMapping classes}
 \section{Super class}{
-\code{\link[tlf:XYDataMapping]{tlf::XYDataMapping}} -> \code{XYGDataMapping}
+\code{tlf::XYDataMapping} -> \code{XYGDataMapping}
 }
 \section{Public fields}{
 \if{html}{\out{<div class="r6-fields">}}
diff --git a/man/YAxisConfiguration.Rd b/man/YAxisConfiguration.Rd
index 1efc8f46..fb46e1db 100644
--- a/man/YAxisConfiguration.Rd
+++ b/man/YAxisConfiguration.Rd
@@ -7,7 +7,7 @@
 R6 class defining the configuration of Y-axis
 }
 \section{Super class}{
-\code{\link[tlf:AxisConfiguration]{tlf::AxisConfiguration}} -> \code{YAxisConfiguration}
+\code{tlf::AxisConfiguration} -> \code{YAxisConfiguration}
 }
 \section{Public fields}{
 \if{html}{\out{<div class="r6-fields">}}
diff --git a/man/tlfStatFunctions.Rd b/man/tlfStatFunctions.Rd
index de9db4da..64daabc2 100644
--- a/man/tlfStatFunctions.Rd
+++ b/man/tlfStatFunctions.Rd
@@ -19,7 +19,7 @@ Other enum helpers:
 \code{\link{AestheticFields}},
 \code{\link{AestheticProperties}},
 \code{\link{Alignments}},
-\code{\link{Atoms}},
+\code{\link{AtomPlots}},
 \code{\link{DataMappings}},
 \code{\link{ExportFormats}},
 \code{\link{ExportUnits}},
@@ -27,7 +27,7 @@ Other enum helpers:
 \code{\link{HorizontalJustification}},
 \code{\link{LegendPositions}},
 \code{\link{Linetypes}},
-\code{\link{Molecules}},
+\code{\link{MoleculePlots}},
 \code{\link{PlotAnnotationTextSize}},
 \code{\link{PlotConfigurations}},
 \code{\link{Scaling}},
diff --git a/tests/testthat/test-atoms.R b/tests/testthat/test-atoms.R
index f4e6d22f..d42ccdeb 100644
--- a/tests/testthat/test-atoms.R
+++ b/tests/testthat/test-atoms.R
@@ -4,7 +4,7 @@ context("Atom Plots")
 
 test_that("Enum 'Atoms' includes all the atoms", {
   expect_setequal(
-    as.character(Atoms),
+    as.character(AtomPlots),
     c("initializePlot", "addScatter", "addLine", "addRibbon", "addErrorbar")
   )
 })
diff --git a/tests/testthat/test-theme.R b/tests/testthat/test-theme.R
index 054a5417..e46ce18c 100644
--- a/tests/testthat/test-theme.R
+++ b/tests/testthat/test-theme.R
@@ -1,12 +1,12 @@
 test_that("PlotConfigurations from default Theme includes all available atom and molecule plots", {
   plotConfigurations <- names(tlf:::tlfEnv$currentTheme$plotConfigurations)
-  expect_true(all(as.character(Molecules) %in% plotConfigurations))
-  expect_true(all(as.character(setdiff(Atoms, "initializePlot")) %in% plotConfigurations))
+  expect_true(all(as.character(MoleculePlots) %in% plotConfigurations))
+  expect_true(all(as.character(setdiff(AtomPlots, "initializePlot")) %in% plotConfigurations))
 })
 
 test_that("PlotConfigurations from any new Theme includes all atom and molecule plots", {
   newTheme <- Theme$new()
   plotConfigurations <- names(newTheme$plotConfigurations)
-  expect_true(all(as.character(Molecules) %in% plotConfigurations))
-  expect_true(all(as.character(setdiff(Atoms, "initializePlot")) %in% plotConfigurations))
+  expect_true(all(as.character(MoleculePlots) %in% plotConfigurations))
+  expect_true(all(as.character(setdiff(AtomPlots, "initializePlot")) %in% plotConfigurations))
 })