diff --git a/include/project.h b/include/project.h
index ee431a3c..c63ff766 100644
--- a/include/project.h
+++ b/include/project.h
@@ -98,7 +98,7 @@ public:
     QList<QStringList>* parseAsm(QString text);
     QStringList getSongNames();
     QStringList getVisibilities();
-    QMap<QString, QStringList> getTilesets();
+    QMap<QString, QStringList> getTilesetLabels();
     void readTilesetProperties();
     void readRegionMapSections();
     void readItemNames();
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 7e1dc184..c112fff0 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -469,7 +469,7 @@ void MainWindow::displayMapProperties() {
     ui->comboBox_Location->addItems(*project->regionMapSections);
     ui->comboBox_Location->setCurrentText(map->location);
 
-    QMap<QString, QStringList> tilesets = project->getTilesets();
+    QMap<QString, QStringList> tilesets = project->getTilesetLabels();
     ui->comboBox_PrimaryTileset->addItems(tilesets.value("primary"));
     ui->comboBox_PrimaryTileset->setCurrentText(map->layout->tileset_primary_label);
     ui->comboBox_SecondaryTileset->addItems(tilesets.value("secondary"));
@@ -880,7 +880,7 @@ void MainWindow::on_actionNew_Tileset_triggered() {
             msgBox.exec();
             return;
         }
-        QMap<QString, QStringList> tilesets = this->editor->project->getTilesets();
+        QMap<QString, QStringList> tilesets = this->editor->project->getTilesetLabels();
         if(tilesets.value("primary").contains(createTilesetDialog->fullSymbolName) || tilesets.value("secondary").contains(createTilesetDialog->fullSymbolName)) {
             logError(QString("Could not create tileset \"%1\", the symbol \"%2\" already exists.").arg(createTilesetDialog->friendlyName, createTilesetDialog->fullSymbolName));
             QMessageBox msgBox(this);
diff --git a/src/project.cpp b/src/project.cpp
index 07c7393f..60ff3273 100644
--- a/src/project.cpp
+++ b/src/project.cpp
@@ -1407,7 +1407,7 @@ QStringList Project::getVisibilities() {
     return names;
 }
 
-QMap<QString, QStringList> Project::getTilesets() {
+QMap<QString, QStringList> Project::getTilesetLabels() {
     QMap<QString, QStringList> allTilesets;
     QStringList primaryTilesets;
     QStringList secondaryTilesets;
diff --git a/src/ui/newmappopup.cpp b/src/ui/newmappopup.cpp
index 6978932b..db2d9134 100644
--- a/src/ui/newmappopup.cpp
+++ b/src/ui/newmappopup.cpp
@@ -48,7 +48,7 @@ void NewMapPopup::useLayout(QString layoutId) {
 void NewMapPopup::setDefaultValues(int groupNum, QString mapSec) {
     ui->lineEdit_NewMap_Name->setText(project->getNewMapName());
 
-    QMap<QString, QStringList> tilesets = project->getTilesets();
+    QMap<QString, QStringList> tilesets = project->getTilesetLabels();
     ui->comboBox_NewMap_Primary_Tileset->addItems(tilesets.value("primary"));
     ui->comboBox_NewMap_Secondary_Tileset->addItems(tilesets.value("secondary"));