diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
index 64261e76c9b..899a2fd9191 100644
--- a/src/main/java/org/jabref/gui/JabRefFrame.java
+++ b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -99,7 +99,7 @@
 import org.jabref.gui.search.GlobalSearchBar;
 import org.jabref.gui.shared.ConnectToSharedDatabaseCommand;
 import org.jabref.gui.specialfields.SpecialFieldMenuItemFactory;
-import org.jabref.gui.texparser.ParseTexAction;
+import org.jabref.gui.texparser.ParseLatexAction;
 import org.jabref.gui.undo.CountingUndoManager;
 import org.jabref.gui.util.BackgroundTask;
 import org.jabref.gui.util.DefaultTaskExecutor;
@@ -770,7 +770,7 @@ private MenuBar createMenu() {
         pushToApplicationsManager.setMenuItem(pushToApplicationMenuItem);
 
         tools.getItems().addAll(
-                factory.createMenuItem(StandardActions.PARSE_TEX, new ParseTexAction(stateManager)),
+                factory.createMenuItem(StandardActions.PARSE_LATEX, new ParseLatexAction(stateManager)),
                 factory.createMenuItem(StandardActions.NEW_SUB_LIBRARY_FROM_AUX, new NewSubLibraryAction(this, stateManager)),
 
                 new SeparatorMenuItem(),
diff --git a/src/main/java/org/jabref/gui/actions/StandardActions.java b/src/main/java/org/jabref/gui/actions/StandardActions.java
index c1b7a2dfa7c..57399a14770 100644
--- a/src/main/java/org/jabref/gui/actions/StandardActions.java
+++ b/src/main/java/org/jabref/gui/actions/StandardActions.java
@@ -85,7 +85,7 @@ public enum StandardActions implements Action {
     TOOGLE_OO(Localization.lang("OpenOffice/LibreOffice"), IconTheme.JabRefIcons.FILE_OPENOFFICE, KeyBinding.OPEN_OPEN_OFFICE_LIBRE_OFFICE_CONNECTION),
     TOGGLE_WEB_SEARCH(Localization.lang("Web search"), Localization.lang("Toggle web search interface"), IconTheme.JabRefIcons.WWW, KeyBinding.WEB_SEARCH),
 
-    PARSE_TEX(Localization.lang("Search for citations in LaTeX files..."), IconTheme.JabRefIcons.LATEX_CITATIONS),
+    PARSE_LATEX(Localization.lang("Search for citations in LaTeX files..."), IconTheme.JabRefIcons.LATEX_CITATIONS),
     NEW_SUB_LIBRARY_FROM_AUX(Localization.lang("New sublibrary based on AUX file") + "...", Localization.lang("New BibTeX sublibrary") + Localization.lang("This feature generates a new library based on which entries are needed in an existing LaTeX document."), IconTheme.JabRefIcons.NEW),
     WRITE_XMP(Localization.lang("Write XMP metadata to PDFs"), Localization.lang("Will write XMP metadata to the PDFs linked from selected entries."), KeyBinding.WRITE_XMP),
     OPEN_FOLDER(Localization.lang("Open folder"), Localization.lang("Open folder"), KeyBinding.OPEN_FOLDER),
diff --git a/src/main/java/org/jabref/gui/entryeditor/LatexCitationsTabViewModel.java b/src/main/java/org/jabref/gui/entryeditor/LatexCitationsTabViewModel.java
index 13546cbc64e..5bda2a4c3c0 100644
--- a/src/main/java/org/jabref/gui/entryeditor/LatexCitationsTabViewModel.java
+++ b/src/main/java/org/jabref/gui/entryeditor/LatexCitationsTabViewModel.java
@@ -26,11 +26,11 @@
 import org.jabref.gui.util.DirectoryDialogConfiguration;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.texparser.DefaultTexParser;
+import org.jabref.logic.texparser.DefaultLatexParser;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.texparser.Citation;
-import org.jabref.model.texparser.TexParserResult;
+import org.jabref.model.texparser.LatexParserResult;
 import org.jabref.preferences.PreferencesService;
 
 import org.slf4j.Logger;
@@ -56,7 +56,7 @@ enum Status {
     private final ObjectProperty<Status> status;
     private final StringProperty searchError;
     private Future<?> searchTask;
-    private TexParserResult texParserResult;
+    private LatexParserResult latexParserResult;
     private BibEntry currentEntry;
 
     public LatexCitationsTabViewModel(BibDatabaseContext databaseContext, PreferencesService preferencesService,
@@ -129,7 +129,7 @@ private Collection<Citation> searchAndParse(String citeKey) throws IOException {
         Path newDirectory = databaseContext.getMetaData().getLatexFileDirectory(preferencesService.getUser())
                                            .orElseGet(preferencesService::getWorkingDir);
 
-        if (texParserResult == null || !newDirectory.equals(directory.get())) {
+        if (latexParserResult == null || !newDirectory.equals(directory.get())) {
             directory.set(newDirectory);
 
             if (!newDirectory.toFile().exists()) {
@@ -137,10 +137,10 @@ private Collection<Citation> searchAndParse(String citeKey) throws IOException {
             }
 
             List<Path> texFiles = searchDirectory(newDirectory, new ArrayList<>());
-            texParserResult = new DefaultTexParser().parse(texFiles);
+            latexParserResult = new DefaultLatexParser().parse(texFiles);
         }
 
-        return texParserResult.getCitationsByKey(citeKey);
+        return latexParserResult.getCitationsByKey(citeKey);
     }
 
     private List<Path> searchDirectory(Path directory, List<Path> texFiles) {
diff --git a/src/main/java/org/jabref/gui/texparser/ParseTexAction.java b/src/main/java/org/jabref/gui/texparser/ParseLatexAction.java
similarity index 75%
rename from src/main/java/org/jabref/gui/texparser/ParseTexAction.java
rename to src/main/java/org/jabref/gui/texparser/ParseLatexAction.java
index 215711e2f27..1c5a2bc8274 100644
--- a/src/main/java/org/jabref/gui/texparser/ParseTexAction.java
+++ b/src/main/java/org/jabref/gui/texparser/ParseLatexAction.java
@@ -5,11 +5,11 @@
 import org.jabref.gui.actions.SimpleCommand;
 import org.jabref.model.database.BibDatabaseContext;
 
-public class ParseTexAction extends SimpleCommand {
+public class ParseLatexAction extends SimpleCommand {
 
     private final StateManager stateManager;
 
-    public ParseTexAction(StateManager stateManager) {
+    public ParseLatexAction(StateManager stateManager) {
         this.stateManager = stateManager;
         executable.bind(ActionHelper.needsDatabase(stateManager));
     }
@@ -17,7 +17,7 @@ public ParseTexAction(StateManager stateManager) {
     @Override
     public void execute() {
         BibDatabaseContext database = stateManager.getActiveDatabase().orElseThrow(NullPointerException::new);
-        ParseTexDialogView dialog = new ParseTexDialogView(database);
+        ParseLatexDialogView dialog = new ParseLatexDialogView(database);
         dialog.showAndWait();
     }
 }
diff --git a/src/main/java/org/jabref/gui/texparser/ParseTexDialog.fxml b/src/main/java/org/jabref/gui/texparser/ParseLatexDialog.fxml
similarity index 92%
rename from src/main/java/org/jabref/gui/texparser/ParseTexDialog.fxml
rename to src/main/java/org/jabref/gui/texparser/ParseLatexDialog.fxml
index 956d744f5ad..05f86c531ed 100644
--- a/src/main/java/org/jabref/gui/texparser/ParseTexDialog.fxml
+++ b/src/main/java/org/jabref/gui/texparser/ParseLatexDialog.fxml
@@ -10,14 +10,14 @@
 <?import javafx.scene.layout.VBox?>
 <?import org.controlsfx.control.CheckTreeView?>
 <DialogPane xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1"
-            fx:controller="org.jabref.gui.texparser.ParseTexDialogView"
+            fx:controller="org.jabref.gui.texparser.ParseLatexDialogView"
             prefWidth="500.0" prefHeight="650.0">
     <content>
         <VBox spacing="10.0">
             <VBox spacing="5.0">
                 <Label text="%LaTeX files directory:"/>
                 <HBox spacing="10.0">
-                    <TextField fx:id="texDirectoryField" HBox.hgrow="ALWAYS"/>
+                    <TextField fx:id="latexDirectoryField" HBox.hgrow="ALWAYS"/>
                     <Button fx:id="browseButton" onAction="#browseButtonClicked" text="%Browse"/>
                     <Button fx:id="searchButton" defaultButton="true" onAction="#searchButtonClicked" text="%Search"/>
                 </HBox>
diff --git a/src/main/java/org/jabref/gui/texparser/ParseTexDialogView.java b/src/main/java/org/jabref/gui/texparser/ParseLatexDialogView.java
similarity index 85%
rename from src/main/java/org/jabref/gui/texparser/ParseTexDialogView.java
rename to src/main/java/org/jabref/gui/texparser/ParseLatexDialogView.java
index 9339471c08d..d5c1fb50920 100644
--- a/src/main/java/org/jabref/gui/texparser/ParseTexDialogView.java
+++ b/src/main/java/org/jabref/gui/texparser/ParseLatexDialogView.java
@@ -28,11 +28,11 @@
 import org.controlsfx.control.CheckTreeView;
 import org.fxmisc.easybind.EasyBind;
 
-public class ParseTexDialogView extends BaseDialog<Void> {
+public class ParseLatexDialogView extends BaseDialog<Void> {
 
     private final BibDatabaseContext databaseContext;
     private final ControlsFxVisualizer validationVisualizer;
-    @FXML private TextField texDirectoryField;
+    @FXML private TextField latexDirectoryField;
     @FXML private Button browseButton;
     @FXML private Button searchButton;
     @FXML private ProgressIndicator progressIndicator;
@@ -44,9 +44,9 @@ public class ParseTexDialogView extends BaseDialog<Void> {
     @Inject private TaskExecutor taskExecutor;
     @Inject private PreferencesService preferencesService;
     @Inject private FileUpdateMonitor fileMonitor;
-    private ParseTexDialogViewModel viewModel;
+    private ParseLatexDialogViewModel viewModel;
 
-    public ParseTexDialogView(BibDatabaseContext databaseContext) {
+    public ParseLatexDialogView(BibDatabaseContext databaseContext) {
         this.databaseContext = databaseContext;
         this.validationVisualizer = new ControlsFxVisualizer();
 
@@ -62,7 +62,7 @@ public ParseTexDialogView(BibDatabaseContext databaseContext) {
 
     @FXML
     private void initialize() {
-        viewModel = new ParseTexDialogViewModel(databaseContext, dialogService, taskExecutor, preferencesService, fileMonitor);
+        viewModel = new ParseLatexDialogViewModel(databaseContext, dialogService, taskExecutor, preferencesService, fileMonitor);
 
         fileTreeView.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
         fileTreeView.showRootProperty().bindBidirectional(viewModel.successfulSearchProperty());
@@ -79,11 +79,11 @@ private void initialize() {
             EasyBind.listBind(viewModel.getCheckedFileList(), fileTreeView.getCheckModel().getCheckedItems());
         });
 
-        texDirectoryField.textProperty().bindBidirectional(viewModel.texDirectoryProperty());
+        latexDirectoryField.textProperty().bindBidirectional(viewModel.latexFileDirectoryProperty());
         validationVisualizer.setDecoration(new IconValidationDecorator());
-        validationVisualizer.initVisualization(viewModel.texDirectoryValidation(), texDirectoryField);
+        validationVisualizer.initVisualization(viewModel.latexDirectoryValidation(), latexDirectoryField);
         browseButton.disableProperty().bindBidirectional(viewModel.searchInProgressProperty());
-        searchButton.disableProperty().bind(viewModel.texDirectoryValidation().validProperty().not());
+        searchButton.disableProperty().bind(viewModel.latexDirectoryValidation().validProperty().not());
         selectAllButton.disableProperty().bindBidirectional(viewModel.noFilesFoundProperty());
         unselectAllButton.disableProperty().bindBidirectional(viewModel.noFilesFoundProperty());
         progressIndicator.visibleProperty().bindBidirectional(viewModel.searchInProgressProperty());
diff --git a/src/main/java/org/jabref/gui/texparser/ParseTexDialogViewModel.java b/src/main/java/org/jabref/gui/texparser/ParseLatexDialogViewModel.java
similarity index 84%
rename from src/main/java/org/jabref/gui/texparser/ParseTexDialogViewModel.java
rename to src/main/java/org/jabref/gui/texparser/ParseLatexDialogViewModel.java
index 7fcac21ff48..a5f6630a68a 100644
--- a/src/main/java/org/jabref/gui/texparser/ParseTexDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/texparser/ParseLatexDialogViewModel.java
@@ -28,7 +28,7 @@
 import org.jabref.gui.util.DirectoryDialogConfiguration;
 import org.jabref.gui.util.TaskExecutor;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.texparser.DefaultTexParser;
+import org.jabref.logic.texparser.DefaultLatexParser;
 import org.jabref.logic.texparser.TexBibEntriesResolver;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.util.FileUpdateMonitor;
@@ -41,34 +41,34 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class ParseTexDialogViewModel extends AbstractViewModel {
+public class ParseLatexDialogViewModel extends AbstractViewModel {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(ParseTexDialogViewModel.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(ParseLatexDialogViewModel.class);
     private static final String TEX_EXT = ".tex";
     private final BibDatabaseContext databaseContext;
     private final DialogService dialogService;
     private final TaskExecutor taskExecutor;
     private final PreferencesService preferencesService;
     private final FileUpdateMonitor fileMonitor;
-    private final StringProperty texDirectory;
-    private final Validator texDirectoryValidator;
+    private final StringProperty latexFileDirectory;
+    private final Validator latexDirectoryValidator;
     private final ObjectProperty<FileNodeViewModel> root;
     private final ObservableList<TreeItem<FileNodeViewModel>> checkedFileList;
     private final BooleanProperty noFilesFound;
     private final BooleanProperty searchInProgress;
     private final BooleanProperty successfulSearch;
 
-    public ParseTexDialogViewModel(BibDatabaseContext databaseContext, DialogService dialogService,
-                                   TaskExecutor taskExecutor, PreferencesService preferencesService,
-                                   FileUpdateMonitor fileMonitor) {
+    public ParseLatexDialogViewModel(BibDatabaseContext databaseContext, DialogService dialogService,
+                                     TaskExecutor taskExecutor, PreferencesService preferencesService,
+                                     FileUpdateMonitor fileMonitor) {
         this.databaseContext = databaseContext;
         this.dialogService = dialogService;
         this.taskExecutor = taskExecutor;
         this.preferencesService = preferencesService;
         this.fileMonitor = fileMonitor;
-        this.texDirectory = new SimpleStringProperty(databaseContext.getMetaData().getLatexFileDirectory(preferencesService.getUser())
-                                                                    .orElseGet(preferencesService::getWorkingDir)
-                                                                    .toAbsolutePath().toString());
+        this.latexFileDirectory = new SimpleStringProperty(databaseContext.getMetaData().getLatexFileDirectory(preferencesService.getUser())
+                                                                          .orElseGet(preferencesService::getWorkingDir)
+                                                                          .toAbsolutePath().toString());
         this.root = new SimpleObjectProperty<>();
         this.checkedFileList = FXCollections.observableArrayList();
         this.noFilesFound = new SimpleBooleanProperty(true);
@@ -76,16 +76,16 @@ public ParseTexDialogViewModel(BibDatabaseContext databaseContext, DialogService
         this.successfulSearch = new SimpleBooleanProperty(false);
 
         Predicate<String> isDirectory = path -> Paths.get(path).toFile().isDirectory();
-        texDirectoryValidator = new FunctionBasedValidator<>(texDirectory, isDirectory,
+        latexDirectoryValidator = new FunctionBasedValidator<>(latexFileDirectory, isDirectory,
                 ValidationMessage.error(Localization.lang("Please enter a valid file path.")));
     }
 
-    public StringProperty texDirectoryProperty() {
-        return texDirectory;
+    public StringProperty latexFileDirectoryProperty() {
+        return latexFileDirectory;
     }
 
-    public ValidationStatus texDirectoryValidation() {
-        return texDirectoryValidator.getValidationStatus();
+    public ValidationStatus latexDirectoryValidation() {
+        return latexDirectoryValidator.getValidationStatus();
     }
 
     public ObjectProperty<FileNodeViewModel> rootProperty() {
@@ -110,10 +110,10 @@ public BooleanProperty successfulSearchProperty() {
 
     public void browseButtonClicked() {
         DirectoryDialogConfiguration directoryDialogConfiguration = new DirectoryDialogConfiguration.Builder()
-                .withInitialDirectory(Paths.get(texDirectory.get())).build();
+                .withInitialDirectory(Paths.get(latexFileDirectory.get())).build();
 
         dialogService.showDirectorySelectionDialog(directoryDialogConfiguration).ifPresent(selectedDirectory -> {
-            texDirectory.set(selectedDirectory.toAbsolutePath().toString());
+            latexFileDirectory.set(selectedDirectory.toAbsolutePath().toString());
             preferencesService.setWorkingDir(selectedDirectory.toAbsolutePath());
         });
     }
@@ -122,7 +122,7 @@ public void browseButtonClicked() {
      * Run a recursive search in a background task.
      */
     public void searchButtonClicked() {
-        BackgroundTask.wrap(() -> searchDirectory(Paths.get(texDirectory.get())))
+        BackgroundTask.wrap(() -> searchDirectory(Paths.get(latexFileDirectory.get())))
                       .onRunning(() -> {
                           root.set(null);
                           noFilesFound.set(true);
@@ -202,10 +202,10 @@ public void parseButtonClicked() {
         TexBibEntriesResolver entriesResolver = new TexBibEntriesResolver(databaseContext.getDatabase(),
                 preferencesService.getImportFormatPreferences(), fileMonitor);
 
-        BackgroundTask.wrap(() -> entriesResolver.resolve(new DefaultTexParser().parse(fileList)))
+        BackgroundTask.wrap(() -> entriesResolver.resolve(new DefaultLatexParser().parse(fileList)))
                       .onRunning(() -> searchInProgress.set(true))
                       .onFinished(() -> searchInProgress.set(false))
-                      .onSuccess(result -> new ParseTexResultView(result, databaseContext, Paths.get(texDirectory.get())).showAndWait())
+                      .onSuccess(result -> new ParseLatexResultView(result, databaseContext, Paths.get(latexFileDirectory.get())).showAndWait())
                       .onFailure(dialogService::showErrorDialogAndWait)
                       .executeWith(taskExecutor);
     }
diff --git a/src/main/java/org/jabref/gui/texparser/ParseTexResult.css b/src/main/java/org/jabref/gui/texparser/ParseLatexResult.css
similarity index 100%
rename from src/main/java/org/jabref/gui/texparser/ParseTexResult.css
rename to src/main/java/org/jabref/gui/texparser/ParseLatexResult.css
diff --git a/src/main/java/org/jabref/gui/texparser/ParseTexResult.fxml b/src/main/java/org/jabref/gui/texparser/ParseLatexResult.fxml
similarity index 92%
rename from src/main/java/org/jabref/gui/texparser/ParseTexResult.fxml
rename to src/main/java/org/jabref/gui/texparser/ParseLatexResult.fxml
index 520164bca78..51e1d109e4a 100644
--- a/src/main/java/org/jabref/gui/texparser/ParseTexResult.fxml
+++ b/src/main/java/org/jabref/gui/texparser/ParseLatexResult.fxml
@@ -9,7 +9,7 @@
 <?import javafx.scene.control.SplitPane?>
 
 <DialogPane xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1"
-            fx:controller="org.jabref.gui.texparser.ParseTexResultView"
+            fx:controller="org.jabref.gui.texparser.ParseLatexResultView"
             prefWidth="900.0" prefHeight="600.0">
     <content>
         <SplitPane dividerPositions="0.2">
diff --git a/src/main/java/org/jabref/gui/texparser/ParseTexResultView.java b/src/main/java/org/jabref/gui/texparser/ParseLatexResultView.java
similarity index 83%
rename from src/main/java/org/jabref/gui/texparser/ParseTexResultView.java
rename to src/main/java/org/jabref/gui/texparser/ParseLatexResultView.java
index 591578383c6..68cf53f7be7 100644
--- a/src/main/java/org/jabref/gui/texparser/ParseTexResultView.java
+++ b/src/main/java/org/jabref/gui/texparser/ParseLatexResultView.java
@@ -13,22 +13,22 @@
 import org.jabref.gui.util.ViewModelListCellFactory;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
-import org.jabref.model.texparser.TexBibEntriesResolverResult;
+import org.jabref.model.texparser.LatexBibEntriesResolverResult;
 
 import com.airhacks.afterburner.views.ViewLoader;
 import org.fxmisc.easybind.EasyBind;
 
-public class ParseTexResultView extends BaseDialog<Void> {
+public class ParseLatexResultView extends BaseDialog<Void> {
 
-    private final TexBibEntriesResolverResult resolverResult;
+    private final LatexBibEntriesResolverResult resolverResult;
     private final BibDatabaseContext databaseContext;
     private final Path basePath;
     @FXML private ListView<ReferenceViewModel> referenceListView;
     @FXML private CitationsDisplay citationsDisplay;
     @FXML private ButtonType importButtonType;
-    private ParseTexResultViewModel viewModel;
+    private ParseLatexResultViewModel viewModel;
 
-    public ParseTexResultView(TexBibEntriesResolverResult resolverResult, BibDatabaseContext databaseContext, Path basePath) {
+    public ParseLatexResultView(LatexBibEntriesResolverResult resolverResult, BibDatabaseContext databaseContext, Path basePath) {
         this.resolverResult = resolverResult;
         this.databaseContext = databaseContext;
         this.basePath = basePath;
@@ -47,7 +47,7 @@ public ParseTexResultView(TexBibEntriesResolverResult resolverResult, BibDatabas
 
     @FXML
     private void initialize() {
-        viewModel = new ParseTexResultViewModel(resolverResult, databaseContext);
+        viewModel = new ParseLatexResultViewModel(resolverResult, databaseContext);
 
         referenceListView.setItems(viewModel.getReferenceList());
         referenceListView.getSelectionModel().selectFirst();
diff --git a/src/main/java/org/jabref/gui/texparser/ParseTexResultViewModel.java b/src/main/java/org/jabref/gui/texparser/ParseLatexResultViewModel.java
similarity index 89%
rename from src/main/java/org/jabref/gui/texparser/ParseTexResultViewModel.java
rename to src/main/java/org/jabref/gui/texparser/ParseLatexResultViewModel.java
index 73d2a7387db..b1e1fe314b2 100644
--- a/src/main/java/org/jabref/gui/texparser/ParseTexResultViewModel.java
+++ b/src/main/java/org/jabref/gui/texparser/ParseLatexResultViewModel.java
@@ -18,17 +18,17 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.texparser.Citation;
-import org.jabref.model.texparser.TexBibEntriesResolverResult;
+import org.jabref.model.texparser.LatexBibEntriesResolverResult;
 
-public class ParseTexResultViewModel extends AbstractViewModel {
+public class ParseLatexResultViewModel extends AbstractViewModel {
 
-    private final TexBibEntriesResolverResult resolverResult;
+    private final LatexBibEntriesResolverResult resolverResult;
     private final BibDatabaseContext databaseContext;
     private final ObservableList<ReferenceViewModel> referenceList;
     private final ObservableList<Citation> citationList;
     private final BooleanProperty importButtonDisabled;
 
-    public ParseTexResultViewModel(TexBibEntriesResolverResult resolverResult, BibDatabaseContext databaseContext) {
+    public ParseLatexResultViewModel(LatexBibEntriesResolverResult resolverResult, BibDatabaseContext databaseContext) {
         this.resolverResult = resolverResult;
         this.databaseContext = databaseContext;
         this.referenceList = FXCollections.observableArrayList();
diff --git a/src/main/java/org/jabref/logic/texparser/DefaultTexParser.java b/src/main/java/org/jabref/logic/texparser/DefaultLatexParser.java
similarity index 83%
rename from src/main/java/org/jabref/logic/texparser/DefaultTexParser.java
rename to src/main/java/org/jabref/logic/texparser/DefaultLatexParser.java
index 64cd449b11f..5cc3aa7cae1 100644
--- a/src/main/java/org/jabref/logic/texparser/DefaultTexParser.java
+++ b/src/main/java/org/jabref/logic/texparser/DefaultLatexParser.java
@@ -17,15 +17,15 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.jabref.model.texparser.TexParser;
-import org.jabref.model.texparser.TexParserResult;
+import org.jabref.model.texparser.LatexParser;
+import org.jabref.model.texparser.LatexParserResult;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class DefaultTexParser implements TexParser {
+public class DefaultLatexParser implements LatexParser {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(DefaultTexParser.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(DefaultLatexParser.class);
     private static final String TEX_EXT = ".tex";
     private static final String BIB_EXT = ".bib";
 
@@ -51,33 +51,33 @@ public class DefaultTexParser implements TexParser {
     private static final Pattern INCLUDE_PATTERN = Pattern.compile(
             String.format("\\\\(?:include|input)\\{(?<%s>[^\\}]*)\\}", INCLUDE_GROUP));
 
-    private final TexParserResult texParserResult;
+    private final LatexParserResult latexParserResult;
 
-    public DefaultTexParser() {
-        this.texParserResult = new TexParserResult();
+    public DefaultLatexParser() {
+        this.latexParserResult = new LatexParserResult();
     }
 
-    public TexParserResult getTexParserResult() {
-        return texParserResult;
+    public LatexParserResult getLatexParserResult() {
+        return latexParserResult;
     }
 
     @Override
-    public TexParserResult parse(String citeString) {
+    public LatexParserResult parse(String citeString) {
         matchCitation(Paths.get(""), 1, citeString);
-        return texParserResult;
+        return latexParserResult;
     }
 
     @Override
-    public TexParserResult parse(Path texFile) {
-        return parse(Collections.singletonList(texFile));
+    public LatexParserResult parse(Path latexFile) {
+        return parse(Collections.singletonList(latexFile));
     }
 
     @Override
-    public TexParserResult parse(List<Path> texFiles) {
-        texParserResult.addFiles(texFiles);
+    public LatexParserResult parse(List<Path> latexFiles) {
+        latexParserResult.addFiles(latexFiles);
         List<Path> referencedFiles = new ArrayList<>();
 
-        for (Path file : texFiles) {
+        for (Path file : latexFiles) {
             if (!file.toFile().exists()) {
                 LOGGER.error(String.format("File does not exist: %s", file));
                 continue;
@@ -94,7 +94,7 @@ public TexParserResult parse(List<Path> texFiles) {
                     }
                     matchCitation(file, lineNumberReader.getLineNumber(), line);
                     matchBibFile(file, line);
-                    matchNestedFile(file, texFiles, referencedFiles, line);
+                    matchNestedFile(file, latexFiles, referencedFiles, line);
                 }
             } catch (ClosedChannelException e) {
                 // User changed the underlying LaTeX file
@@ -109,11 +109,11 @@ public TexParserResult parse(List<Path> texFiles) {
 
         // Parse all files referenced by TEX files, recursively.
         if (!referencedFiles.isEmpty()) {
-            // modifies class variable texParserResult
+            // modifies class variable latexParserResult
             parse(referencedFiles);
         }
 
-        return texParserResult;
+        return latexParserResult;
     }
 
     /**
@@ -124,7 +124,7 @@ private void matchCitation(Path file, int lineNumber, String line) {
 
         while (citeMatch.find()) {
             for (String key : citeMatch.group(CITE_GROUP).split(",")) {
-                texParserResult.addKey(key.trim(), file, lineNumber, citeMatch.start(), citeMatch.end(), line);
+                latexParserResult.addKey(key.trim(), file, lineNumber, citeMatch.start(), citeMatch.end(), line);
             }
         }
     }
@@ -144,7 +144,7 @@ private void matchBibFile(Path file, String line) {
                                 : String.format("%s%s", bibString, BIB_EXT));
 
                 if (bibFile.toFile().exists()) {
-                    texParserResult.addBibFile(file, bibFile);
+                    latexParserResult.addBibFile(file, bibFile);
                 }
             }
         }
diff --git a/src/main/java/org/jabref/logic/texparser/TexBibEntriesResolver.java b/src/main/java/org/jabref/logic/texparser/TexBibEntriesResolver.java
index 0abb5ea1232..4f7888fbd2d 100644
--- a/src/main/java/org/jabref/logic/texparser/TexBibEntriesResolver.java
+++ b/src/main/java/org/jabref/logic/texparser/TexBibEntriesResolver.java
@@ -12,8 +12,8 @@
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.texparser.Citation;
-import org.jabref.model.texparser.TexBibEntriesResolverResult;
-import org.jabref.model.texparser.TexParserResult;
+import org.jabref.model.texparser.LatexBibEntriesResolverResult;
+import org.jabref.model.texparser.LatexParserResult;
 import org.jabref.model.util.FileUpdateMonitor;
 
 public class TexBibEntriesResolver {
@@ -31,17 +31,17 @@ public TexBibEntriesResolver(BibDatabase masterDatabase, ImportFormatPreferences
     /**
      * Resolve all BibTeX entries and check if they are in the given database.
      */
-    public TexBibEntriesResolverResult resolve(TexParserResult texParserResult) {
-        TexBibEntriesResolverResult resolverResult = new TexBibEntriesResolverResult(texParserResult);
+    public LatexBibEntriesResolverResult resolve(LatexParserResult latexParserResult) {
+        LatexBibEntriesResolverResult resolverResult = new LatexBibEntriesResolverResult(latexParserResult);
 
         // Preload databases from BIB files.
         Map<Path, BibDatabase> bibDatabases = resolverResult.getBibFiles().values().stream().distinct().collect(Collectors.toMap(
                 Function.identity(), path -> OpenDatabase.loadDatabase(path.toString(), importFormatPreferences, fileMonitor).getDatabase()));
 
         // Get all pairs Entry<String entryKey, Citation>.
-        Stream<Map.Entry<String, Citation>> citationsStream = texParserResult.getCitations().entries().stream().distinct();
+        Stream<Map.Entry<String, Citation>> citationsStream = latexParserResult.getCitations().entries().stream().distinct();
 
-        Set<BibEntry> newEntries = citationsStream.flatMap(mapEntry -> apply(mapEntry, texParserResult, bibDatabases)).collect(Collectors.toSet());
+        Set<BibEntry> newEntries = citationsStream.flatMap(mapEntry -> apply(mapEntry, latexParserResult, bibDatabases)).collect(Collectors.toSet());
 
         // Add all new entries to the newEntries set.
         resolverResult.getNewEntries().addAll(newEntries);
@@ -49,8 +49,8 @@ public TexBibEntriesResolverResult resolve(TexParserResult texParserResult) {
         return resolverResult;
     }
 
-    private Stream<? extends BibEntry> apply(Map.Entry<String, Citation> mapEntry, TexParserResult texParserResult, Map<Path, BibDatabase> bibDatabases) {
-        return texParserResult.getBibFiles().get(mapEntry.getValue().getPath()).stream().distinct().flatMap(bibFile ->
+    private Stream<? extends BibEntry> apply(Map.Entry<String, Citation> mapEntry, LatexParserResult latexParserResult, Map<Path, BibDatabase> bibDatabases) {
+        return latexParserResult.getBibFiles().get(mapEntry.getValue().getPath()).stream().distinct().flatMap(bibFile ->
                 // Get a specific entry from an entryKey and a BIB file.
                 bibDatabases.get(bibFile).getEntriesByKey(mapEntry.getKey()).stream().distinct()
                             // Check if there is already an entry with the same key in the given database.
diff --git a/src/main/java/org/jabref/model/texparser/TexBibEntriesResolverResult.java b/src/main/java/org/jabref/model/texparser/LatexBibEntriesResolverResult.java
similarity index 58%
rename from src/main/java/org/jabref/model/texparser/TexBibEntriesResolverResult.java
rename to src/main/java/org/jabref/model/texparser/LatexBibEntriesResolverResult.java
index 83f097a3600..e545a6f4840 100644
--- a/src/main/java/org/jabref/model/texparser/TexBibEntriesResolverResult.java
+++ b/src/main/java/org/jabref/model/texparser/LatexBibEntriesResolverResult.java
@@ -9,18 +9,18 @@
 
 import com.google.common.collect.Multimap;
 
-public class TexBibEntriesResolverResult {
+public class LatexBibEntriesResolverResult {
 
-    private final TexParserResult texParserResult;
+    private final LatexParserResult latexParserResult;
     private final Set<BibEntry> newEntries;
 
-    public TexBibEntriesResolverResult(TexParserResult texParserResult) {
-        this.texParserResult = texParserResult;
+    public LatexBibEntriesResolverResult(LatexParserResult latexParserResult) {
+        this.latexParserResult = latexParserResult;
         this.newEntries = new HashSet<>();
     }
 
-    public TexParserResult getTexParserResult() {
-        return texParserResult;
+    public LatexParserResult getLatexParserResult() {
+        return latexParserResult;
     }
 
     public Set<BibEntry> getNewEntries() {
@@ -32,23 +32,23 @@ public void addEntry(BibEntry entry) {
     }
 
     /**
-     * Return the BIB files multimap from the TexParserResult object.
+     * @return the BIB files multimap from the LatexParserResult object.
      */
     public Multimap<Path, Path> getBibFiles() {
-        return texParserResult.getBibFiles();
+        return latexParserResult.getBibFiles();
     }
 
     /**
-     * Return the citations multimap from the TexParserResult object.
+     * @return the citations multimap from the LatexParserResult object.
      */
     public Multimap<String, Citation> getCitations() {
-        return texParserResult.getCitations();
+        return latexParserResult.getCitations();
     }
 
     @Override
     public String toString() {
         return String.format("TexBibEntriesResolverResult{texParserResult=%s, newEntries=%s}",
-                this.texParserResult,
+                this.latexParserResult,
                 this.newEntries);
     }
 
@@ -62,14 +62,14 @@ public boolean equals(Object obj) {
             return false;
         }
 
-        TexBibEntriesResolverResult that = (TexBibEntriesResolverResult) obj;
+        LatexBibEntriesResolverResult that = (LatexBibEntriesResolverResult) obj;
 
-        return Objects.equals(texParserResult, that.texParserResult)
+        return Objects.equals(latexParserResult, that.latexParserResult)
                 && Objects.equals(newEntries, that.newEntries);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(texParserResult, newEntries);
+        return Objects.hash(latexParserResult, newEntries);
     }
 }
diff --git a/src/main/java/org/jabref/model/texparser/LatexParser.java b/src/main/java/org/jabref/model/texparser/LatexParser.java
new file mode 100644
index 00000000000..36526ed6ae5
--- /dev/null
+++ b/src/main/java/org/jabref/model/texparser/LatexParser.java
@@ -0,0 +1,34 @@
+package org.jabref.model.texparser;
+
+import java.nio.file.Path;
+import java.util.List;
+
+/**
+ * Parses a LaTeX file
+ */
+public interface LatexParser {
+
+    /**
+     * For testing purposes.
+     *
+     * @param citeString String that contains a citation
+     * @return a LatexParserResult, where Path is "" and lineNumber is 1
+     */
+    LatexParserResult parse(String citeString);
+
+    /**
+     * Parse a single LaTeX file.
+     *
+     * @param latexFile Path to a LaTeX file
+     * @return a LatexParserResult, which contains all data related to the bibliographic entries
+     */
+    LatexParserResult parse(Path latexFile);
+
+    /**
+     * Parse a list of LaTeX files.
+     *
+     * @param latexFiles List of Path objects linked to a LaTeX file
+     * @return a LatexParserResult, which contains all data related to the bibliographic entries
+     */
+    LatexParserResult parse(List<Path> latexFiles);
+}
diff --git a/src/main/java/org/jabref/model/texparser/TexParserResult.java b/src/main/java/org/jabref/model/texparser/LatexParserResult.java
similarity index 96%
rename from src/main/java/org/jabref/model/texparser/TexParserResult.java
rename to src/main/java/org/jabref/model/texparser/LatexParserResult.java
index 4b9073c1c03..00b6d894733 100644
--- a/src/main/java/org/jabref/model/texparser/TexParserResult.java
+++ b/src/main/java/org/jabref/model/texparser/LatexParserResult.java
@@ -13,16 +13,16 @@
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
 
-public class TexParserResult {
+public class LatexParserResult {
 
     private final List<Path> fileList;
     private final List<Path> nestedFiles;
     private final Multimap<Path, Path> bibFiles;
-  
+
     // BibTeXKey --> set of citations
     private final Multimap<String, Citation> citations;
 
-    public TexParserResult() {
+    public LatexParserResult() {
         this.fileList = new ArrayList<>();
         this.nestedFiles = new ArrayList<>();
         this.bibFiles = HashMultimap.create();
@@ -111,7 +111,7 @@ public boolean equals(Object obj) {
             return false;
         }
 
-        TexParserResult that = (TexParserResult) obj;
+        LatexParserResult that = (LatexParserResult) obj;
 
         return Objects.equals(fileList, that.fileList)
                 && Objects.equals(nestedFiles, that.nestedFiles)
diff --git a/src/main/java/org/jabref/model/texparser/TexParser.java b/src/main/java/org/jabref/model/texparser/TexParser.java
deleted file mode 100644
index 41e4ee2c673..00000000000
--- a/src/main/java/org/jabref/model/texparser/TexParser.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.jabref.model.texparser;
-
-import java.nio.file.Path;
-import java.util.List;
-
-public interface TexParser {
-
-    /**
-     * For testing purposes.
-     *
-     * @param citeString String that contains a citation
-     * @return a TexParserResult, where Path is "" and lineNumber is 1
-     */
-    TexParserResult parse(String citeString);
-
-    /**
-     * Parse a single TEX file.
-     *
-     * @param texFile Path to a TEX file
-     * @return a TexParserResult, which contains all data related to the bibliographic entries
-     */
-    TexParserResult parse(Path texFile);
-
-    /**
-     * Parse a list of TEX files.
-     *
-     * @param texFiles List of Path objects linked to a TEX file
-     * @return a TexParserResult, which contains all data related to the bibliographic entries
-     */
-    TexParserResult parse(List<Path> texFiles);
-}
diff --git a/src/test/java/org/jabref/logic/texparser/DefaultTexParserTest.java b/src/test/java/org/jabref/logic/texparser/DefaultTexParserTest.java
index 06b481efaab..32022cd2861 100644
--- a/src/test/java/org/jabref/logic/texparser/DefaultTexParserTest.java
+++ b/src/test/java/org/jabref/logic/texparser/DefaultTexParserTest.java
@@ -5,7 +5,7 @@
 import java.nio.file.Paths;
 import java.util.Arrays;
 
-import org.jabref.model.texparser.TexParserResult;
+import org.jabref.model.texparser.LatexParserResult;
 
 import org.junit.jupiter.api.Test;
 
@@ -22,19 +22,19 @@ public class DefaultTexParserTest {
     private final static String UNKNOWN = "UnknownKey";
 
     private void testMatchCite(String key, String citeString) {
-        TexParserResult texParserResult = new DefaultTexParser().parse(citeString);
-        TexParserResult expectedParserResult = new TexParserResult();
+        LatexParserResult latexParserResult = new DefaultLatexParser().parse(citeString);
+        LatexParserResult expectedParserResult = new LatexParserResult();
 
         expectedParserResult.addKey(key, Paths.get(""), 1, 0, citeString.length(), citeString);
 
-        assertEquals(expectedParserResult, texParserResult);
+        assertEquals(expectedParserResult, latexParserResult);
     }
 
     private void testNonMatchCite(String citeString) {
-        TexParserResult texParserResult = new DefaultTexParser().parse(citeString);
-        TexParserResult expectedParserResult = new TexParserResult();
+        LatexParserResult latexParserResult = new DefaultLatexParser().parse(citeString);
+        LatexParserResult expectedParserResult = new LatexParserResult();
 
-        assertEquals(expectedParserResult, texParserResult);
+        assertEquals(expectedParserResult, latexParserResult);
     }
 
     @Test
@@ -59,21 +59,21 @@ public void testCiteCommands() {
     public void testTwoCitationsSameLine() {
         String citeString = "\\citep{Einstein1920c} and \\citep{Einstein1920a}";
 
-        TexParserResult texParserResult = new DefaultTexParser().parse(citeString);
-        TexParserResult expectedParserResult = new TexParserResult();
+        LatexParserResult latexParserResult = new DefaultLatexParser().parse(citeString);
+        LatexParserResult expectedParserResult = new LatexParserResult();
 
         expectedParserResult.addKey(EINSTEIN_C, Paths.get(""), 1, 0, 21, citeString);
         expectedParserResult.addKey(EINSTEIN_A, Paths.get(""), 1, 26, 47, citeString);
 
-        assertEquals(expectedParserResult, texParserResult);
+        assertEquals(expectedParserResult, latexParserResult);
     }
 
     @Test
     public void testFileEncodingUtf8() throws URISyntaxException {
         Path texFile = Paths.get(DefaultTexParserTest.class.getResource("utf-8.tex").toURI());
 
-        TexParserResult parserResult = new DefaultTexParser().parse(texFile);
-        TexParserResult expectedParserResult = new TexParserResult();
+        LatexParserResult parserResult = new DefaultLatexParser().parse(texFile);
+        LatexParserResult expectedParserResult = new LatexParserResult();
 
         expectedParserResult.getFileList().add(texFile);
         expectedParserResult.addKey("anykey", texFile, 1, 32, 45, "Danach wir anschließend mittels \\cite{anykey}.");
@@ -85,8 +85,8 @@ public void testFileEncodingUtf8() throws URISyntaxException {
     public void testFileEncodingIso88591() throws URISyntaxException {
         Path texFile = Paths.get(DefaultTexParserTest.class.getResource("iso-8859-1.tex").toURI());
 
-        TexParserResult parserResult = new DefaultTexParser().parse(texFile);
-        TexParserResult expectedParserResult = new TexParserResult();
+        LatexParserResult parserResult = new DefaultLatexParser().parse(texFile);
+        LatexParserResult expectedParserResult = new LatexParserResult();
 
         expectedParserResult.getFileList().add(texFile);
         // The character � is on purpose - we cannot use Apache Tika's CharsetDetector - see ADR-0005
@@ -100,8 +100,8 @@ public void testFileEncodingIso88591() throws URISyntaxException {
     public void testFileEncodingIso885915() throws URISyntaxException {
         Path texFile = Paths.get(DefaultTexParserTest.class.getResource("iso-8859-15.tex").toURI());
 
-        TexParserResult parserResult = new DefaultTexParser().parse(texFile);
-        TexParserResult expectedParserResult = new TexParserResult();
+        LatexParserResult parserResult = new DefaultLatexParser().parse(texFile);
+        LatexParserResult expectedParserResult = new LatexParserResult();
 
         expectedParserResult.getFileList().add(texFile);
         // The character � is on purpose - we cannot use Apache Tika's CharsetDetector - see ADR-0005
@@ -117,9 +117,9 @@ public void testFileEncodingForThreeFiles() throws URISyntaxException {
         Path texFile2 = Paths.get(DefaultTexParserTest.class.getResource("iso-8859-1.tex").toURI());
         Path texFile3 = Paths.get(DefaultTexParserTest.class.getResource("iso-8859-15.tex").toURI());
 
-        TexParserResult parserResult = new DefaultTexParser()
+        LatexParserResult parserResult = new DefaultLatexParser()
                 .parse(Arrays.asList(texFile, texFile2, texFile3));
-        TexParserResult expectedParserResult = new TexParserResult();
+        LatexParserResult expectedParserResult = new LatexParserResult();
 
         expectedParserResult.getFileList().addAll(Arrays.asList(texFile, texFile2, texFile3));
         expectedParserResult
@@ -136,8 +136,8 @@ public void testFileEncodingForThreeFiles() throws URISyntaxException {
     public void testSingleFile() throws URISyntaxException {
         Path texFile = Paths.get(DefaultTexParserTest.class.getResource("paper.tex").toURI());
 
-        TexParserResult parserResult = new DefaultTexParser().parse(texFile);
-        TexParserResult expectedParserResult = new TexParserResult();
+        LatexParserResult parserResult = new DefaultLatexParser().parse(texFile);
+        LatexParserResult expectedParserResult = new LatexParserResult();
 
         expectedParserResult.getFileList().add(texFile);
         expectedParserResult.addBibFile(texFile, texFile.getParent().resolve("origin.bib"));
@@ -154,8 +154,8 @@ public void testTwoFiles() throws URISyntaxException {
         Path texFile = Paths.get(DefaultTexParserTest.class.getResource("paper.tex").toURI());
         Path texFile2 = Paths.get(DefaultTexParserTest.class.getResource("paper2.tex").toURI());
 
-        TexParserResult parserResult = new DefaultTexParser().parse(Arrays.asList(texFile, texFile2));
-        TexParserResult expectedParserResult = new TexParserResult();
+        LatexParserResult parserResult = new DefaultLatexParser().parse(Arrays.asList(texFile, texFile2));
+        LatexParserResult expectedParserResult = new LatexParserResult();
 
         expectedParserResult.getFileList().addAll(Arrays.asList(texFile, texFile2));
         expectedParserResult.addBibFile(texFile, texFile.getParent().resolve("origin.bib"));
@@ -175,8 +175,8 @@ public void testTwoFiles() throws URISyntaxException {
     public void testDuplicateFiles() throws URISyntaxException {
         Path texFile = Paths.get(DefaultTexParserTest.class.getResource("paper.tex").toURI());
 
-        TexParserResult parserResult = new DefaultTexParser().parse(Arrays.asList(texFile, texFile));
-        TexParserResult expectedParserResult = new TexParserResult();
+        LatexParserResult parserResult = new DefaultLatexParser().parse(Arrays.asList(texFile, texFile));
+        LatexParserResult expectedParserResult = new LatexParserResult();
 
         expectedParserResult.getFileList().addAll(Arrays.asList(texFile, texFile));
         expectedParserResult.addBibFile(texFile, texFile.getParent().resolve("origin.bib"));
@@ -192,8 +192,8 @@ public void testDuplicateFiles() throws URISyntaxException {
     public void testUnknownKey() throws URISyntaxException {
         Path texFile = Paths.get(DefaultTexParserTest.class.getResource("unknown_key.tex").toURI());
 
-        TexParserResult parserResult = new DefaultTexParser().parse(texFile);
-        TexParserResult expectedParserResult = new TexParserResult();
+        LatexParserResult parserResult = new DefaultLatexParser().parse(texFile);
+        LatexParserResult expectedParserResult = new LatexParserResult();
 
         expectedParserResult.getFileList().add(texFile);
         expectedParserResult.addBibFile(texFile, texFile.getParent().resolve("origin.bib"));
@@ -208,8 +208,8 @@ public void testUnknownKey() throws URISyntaxException {
     public void testFileNotFound() {
         Path texFile = Paths.get("file_not_found.tex");
 
-        TexParserResult parserResult = new DefaultTexParser().parse(texFile);
-        TexParserResult expectedParserResult = new TexParserResult();
+        LatexParserResult parserResult = new DefaultLatexParser().parse(texFile);
+        LatexParserResult expectedParserResult = new LatexParserResult();
 
         expectedParserResult.getFileList().add(texFile);
 
@@ -222,8 +222,8 @@ public void testNestedFiles() throws URISyntaxException {
         Path texFile2 = Paths.get(DefaultTexParserTest.class.getResource("nested2.tex").toURI());
         Path texFile3 = Paths.get(DefaultTexParserTest.class.getResource("paper.tex").toURI());
 
-        TexParserResult parserResult = new DefaultTexParser().parse(texFile);
-        TexParserResult expectedParserResult = new TexParserResult();
+        LatexParserResult parserResult = new DefaultLatexParser().parse(texFile);
+        LatexParserResult expectedParserResult = new LatexParserResult();
 
         expectedParserResult.getFileList().add(texFile);
         expectedParserResult.getNestedFiles().addAll(Arrays.asList(texFile2, texFile3));
diff --git a/src/test/java/org/jabref/logic/texparser/TexParserTest.java b/src/test/java/org/jabref/logic/texparser/LatexParserTest.java
similarity index 78%
rename from src/test/java/org/jabref/logic/texparser/TexParserTest.java
rename to src/test/java/org/jabref/logic/texparser/LatexParserTest.java
index 85c151b1600..105ca220f0e 100644
--- a/src/test/java/org/jabref/logic/texparser/TexParserTest.java
+++ b/src/test/java/org/jabref/logic/texparser/LatexParserTest.java
@@ -11,8 +11,8 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
-import org.jabref.model.texparser.TexBibEntriesResolverResult;
-import org.jabref.model.texparser.TexParserResult;
+import org.jabref.model.texparser.LatexBibEntriesResolverResult;
+import org.jabref.model.texparser.LatexParserResult;
 import org.jabref.model.util.DummyFileUpdateMonitor;
 import org.jabref.model.util.FileUpdateMonitor;
 
@@ -24,7 +24,7 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-public class TexParserTest {
+public class LatexParserTest {
     private final static String DARWIN = "Darwin1888";
     private final static String EINSTEIN = "Einstein1920";
     private final static String NEWTON = "Newton1999";
@@ -91,10 +91,10 @@ private void setUp() {
 
     @Test
     public void testSameFileDifferentDatabases() throws URISyntaxException {
-        Path texFile = Paths.get(TexParserTest.class.getResource("paper.tex").toURI());
+        Path texFile = Paths.get(LatexParserTest.class.getResource("paper.tex").toURI());
 
-        TexParserResult parserResult = new DefaultTexParser().parse(texFile);
-        TexParserResult expectedParserResult = new TexParserResult();
+        LatexParserResult parserResult = new DefaultLatexParser().parse(texFile);
+        LatexParserResult expectedParserResult = new LatexParserResult();
 
         expectedParserResult.getFileList().add(texFile);
         expectedParserResult.addBibFile(texFile, texFile.getParent().resolve("origin.bib"));
@@ -103,13 +103,13 @@ public void testSameFileDifferentDatabases() throws URISyntaxException {
         expectedParserResult.addKey(EINSTEIN, texFile, 6, 14, 33, "Einstein said \\cite{Einstein1920} that lorem impsum, consectetur adipiscing elit.");
         expectedParserResult.addKey(DARWIN, texFile, 7, 67, 84, "Nunc ultricies leo nec libero rhoncus, eu vehicula enim efficitur. \\cite{Darwin1888}");
 
-        TexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, importFormatPreferences, fileMonitor).resolve(parserResult);
-        TexBibEntriesResolverResult expectedCrossingResult = new TexBibEntriesResolverResult(expectedParserResult);
+        LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, importFormatPreferences, fileMonitor).resolve(parserResult);
+        LatexBibEntriesResolverResult expectedCrossingResult = new LatexBibEntriesResolverResult(expectedParserResult);
 
         assertEquals(expectedCrossingResult, crossingResult);
 
-        TexBibEntriesResolverResult crossingResult2 = new TexBibEntriesResolver(database2, importFormatPreferences, fileMonitor).resolve(parserResult);
-        TexBibEntriesResolverResult expectedCrossingResult2 = new TexBibEntriesResolverResult(expectedParserResult);
+        LatexBibEntriesResolverResult crossingResult2 = new TexBibEntriesResolver(database2, importFormatPreferences, fileMonitor).resolve(parserResult);
+        LatexBibEntriesResolverResult expectedCrossingResult2 = new LatexBibEntriesResolverResult(expectedParserResult);
 
         expectedCrossingResult2.addEntry(database.getEntryByKey(EINSTEIN).get());
         expectedCrossingResult2.addEntry(database.getEntryByKey(DARWIN).get());
@@ -119,11 +119,11 @@ public void testSameFileDifferentDatabases() throws URISyntaxException {
 
     @Test
     public void testTwoFilesDifferentDatabases() throws URISyntaxException {
-        Path texFile = Paths.get(TexParserTest.class.getResource("paper.tex").toURI());
-        Path texFile2 = Paths.get(TexParserTest.class.getResource("paper2.tex").toURI());
+        Path texFile = Paths.get(LatexParserTest.class.getResource("paper.tex").toURI());
+        Path texFile2 = Paths.get(LatexParserTest.class.getResource("paper2.tex").toURI());
 
-        TexParserResult parserResult = new DefaultTexParser().parse(Arrays.asList(texFile, texFile2));
-        TexParserResult expectedParserResult = new TexParserResult();
+        LatexParserResult parserResult = new DefaultLatexParser().parse(Arrays.asList(texFile, texFile2));
+        LatexParserResult expectedParserResult = new LatexParserResult();
 
         expectedParserResult.getFileList().addAll(Arrays.asList(texFile, texFile2));
         expectedParserResult.addBibFile(texFile, texFile.getParent().resolve("origin.bib"));
@@ -136,13 +136,13 @@ public void testTwoFilesDifferentDatabases() throws URISyntaxException {
         expectedParserResult.addKey(EINSTEIN, texFile2, 5, 48, 67, "This is some content trying to cite a bib file: \\cite{Einstein1920}");
         expectedParserResult.addKey(NEWTON, texFile2, 6, 48, 65, "This is some content trying to cite a bib file: \\cite{Newton1999}");
 
-        TexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, importFormatPreferences, fileMonitor).resolve(parserResult);
-        TexBibEntriesResolverResult expectedCrossingResult = new TexBibEntriesResolverResult(expectedParserResult);
+        LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, importFormatPreferences, fileMonitor).resolve(parserResult);
+        LatexBibEntriesResolverResult expectedCrossingResult = new LatexBibEntriesResolverResult(expectedParserResult);
 
         assertEquals(expectedCrossingResult, crossingResult);
 
-        TexBibEntriesResolverResult crossingResult2 = new TexBibEntriesResolver(database2, importFormatPreferences, fileMonitor).resolve(parserResult);
-        TexBibEntriesResolverResult expectedCrossingResult2 = new TexBibEntriesResolverResult(expectedParserResult);
+        LatexBibEntriesResolverResult crossingResult2 = new TexBibEntriesResolver(database2, importFormatPreferences, fileMonitor).resolve(parserResult);
+        LatexBibEntriesResolverResult expectedCrossingResult2 = new LatexBibEntriesResolverResult(expectedParserResult);
 
         expectedCrossingResult2.addEntry(database.getEntryByKey(EINSTEIN).get());
         expectedCrossingResult2.addEntry(database.getEntryByKey(DARWIN).get());
diff --git a/src/test/java/org/jabref/logic/texparser/TexBibEntriesResolverTest.java b/src/test/java/org/jabref/logic/texparser/TexBibEntriesResolverTest.java
index 0927fa43083..cd8dce92474 100644
--- a/src/test/java/org/jabref/logic/texparser/TexBibEntriesResolverTest.java
+++ b/src/test/java/org/jabref/logic/texparser/TexBibEntriesResolverTest.java
@@ -11,8 +11,8 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.entry.types.StandardEntryType;
-import org.jabref.model.texparser.TexBibEntriesResolverResult;
-import org.jabref.model.texparser.TexParserResult;
+import org.jabref.model.texparser.LatexBibEntriesResolverResult;
+import org.jabref.model.texparser.LatexParserResult;
 import org.jabref.model.util.DummyFileUpdateMonitor;
 import org.jabref.model.util.FileUpdateMonitor;
 
@@ -101,10 +101,10 @@ private void setUp() {
     @Test
     public void testSingleFile() throws URISyntaxException {
         Path texFile = Paths.get(TexBibEntriesResolverTest.class.getResource("paper.tex").toURI());
-        TexParserResult parserResult = new DefaultTexParser().parse(texFile);
+        LatexParserResult parserResult = new DefaultLatexParser().parse(texFile);
 
-        TexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, importFormatPreferences, fileMonitor).resolve(parserResult);
-        TexBibEntriesResolverResult expectedCrossingResult = new TexBibEntriesResolverResult(parserResult);
+        LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, importFormatPreferences, fileMonitor).resolve(parserResult);
+        LatexBibEntriesResolverResult expectedCrossingResult = new LatexBibEntriesResolverResult(parserResult);
 
         assertEquals(expectedCrossingResult, crossingResult);
     }
@@ -113,10 +113,10 @@ public void testSingleFile() throws URISyntaxException {
     public void testTwoFiles() throws URISyntaxException {
         Path texFile = Paths.get(TexBibEntriesResolverTest.class.getResource("paper.tex").toURI());
         Path texFile2 = Paths.get(TexBibEntriesResolverTest.class.getResource("paper2.tex").toURI());
-        TexParserResult parserResult = new DefaultTexParser().parse(Arrays.asList(texFile, texFile2));
+        LatexParserResult parserResult = new DefaultLatexParser().parse(Arrays.asList(texFile, texFile2));
 
-        TexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, importFormatPreferences, fileMonitor).resolve(parserResult);
-        TexBibEntriesResolverResult expectedCrossingResult = new TexBibEntriesResolverResult(parserResult);
+        LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, importFormatPreferences, fileMonitor).resolve(parserResult);
+        LatexBibEntriesResolverResult expectedCrossingResult = new LatexBibEntriesResolverResult(parserResult);
 
         assertEquals(expectedCrossingResult, crossingResult);
     }
@@ -124,10 +124,10 @@ public void testTwoFiles() throws URISyntaxException {
     @Test
     public void testDuplicateFiles() throws URISyntaxException {
         Path texFile = Paths.get(TexBibEntriesResolverTest.class.getResource("paper.tex").toURI());
-        TexParserResult parserResult = new DefaultTexParser().parse(texFile);
+        LatexParserResult parserResult = new DefaultLatexParser().parse(texFile);
 
-        TexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, importFormatPreferences, fileMonitor).resolve(parserResult);
-        TexBibEntriesResolverResult expectedCrossingResult = new TexBibEntriesResolverResult(parserResult);
+        LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, importFormatPreferences, fileMonitor).resolve(parserResult);
+        LatexBibEntriesResolverResult expectedCrossingResult = new LatexBibEntriesResolverResult(parserResult);
 
         assertEquals(expectedCrossingResult, crossingResult);
     }
@@ -135,10 +135,10 @@ public void testDuplicateFiles() throws URISyntaxException {
     @Test
     public void testUnknownKey() throws URISyntaxException {
         Path texFile = Paths.get(TexBibEntriesResolverTest.class.getResource("unknown_key.tex").toURI());
-        TexParserResult parserResult = new DefaultTexParser().parse(texFile);
+        LatexParserResult parserResult = new DefaultLatexParser().parse(texFile);
 
-        TexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, importFormatPreferences, fileMonitor).resolve(parserResult);
-        TexBibEntriesResolverResult expectedCrossingResult = new TexBibEntriesResolverResult(parserResult);
+        LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, importFormatPreferences, fileMonitor).resolve(parserResult);
+        LatexBibEntriesResolverResult expectedCrossingResult = new LatexBibEntriesResolverResult(parserResult);
 
         assertEquals(expectedCrossingResult, crossingResult);
     }
@@ -146,10 +146,10 @@ public void testUnknownKey() throws URISyntaxException {
     @Test
     public void testNestedFiles() throws URISyntaxException {
         Path texFile = Paths.get(TexBibEntriesResolverTest.class.getResource("nested.tex").toURI());
-        TexParserResult parserResult = new DefaultTexParser().parse(texFile);
+        LatexParserResult parserResult = new DefaultLatexParser().parse(texFile);
 
-        TexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, importFormatPreferences, fileMonitor).resolve(parserResult);
-        TexBibEntriesResolverResult expectedCrossingResult = new TexBibEntriesResolverResult(parserResult);
+        LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, importFormatPreferences, fileMonitor).resolve(parserResult);
+        LatexBibEntriesResolverResult expectedCrossingResult = new LatexBibEntriesResolverResult(parserResult);
 
         assertEquals(expectedCrossingResult, crossingResult);
     }
@@ -157,10 +157,10 @@ public void testNestedFiles() throws URISyntaxException {
     @Test
     public void testCrossRef() throws URISyntaxException {
         Path texFile = Paths.get(TexBibEntriesResolverTest.class.getResource("crossref.tex").toURI());
-        TexParserResult parserResult = new DefaultTexParser().parse(texFile);
+        LatexParserResult parserResult = new DefaultLatexParser().parse(texFile);
 
-        TexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, importFormatPreferences, fileMonitor).resolve(parserResult);
-        TexBibEntriesResolverResult expectedCrossingResult = new TexBibEntriesResolverResult(parserResult);
+        LatexBibEntriesResolverResult crossingResult = new TexBibEntriesResolver(database, importFormatPreferences, fileMonitor).resolve(parserResult);
+        LatexBibEntriesResolverResult expectedCrossingResult = new LatexBibEntriesResolverResult(parserResult);
 
         expectedCrossingResult.addEntry(bibEntry);