diff --git a/apps/golfview/custom.html b/apps/golfview/custom.html
index edbb490bd..6ea92cba9 100644
--- a/apps/golfview/custom.html
+++ b/apps/golfview/custom.html
@@ -220,7 +220,7 @@
         out = processFeatures(result.elements);
         console.log(out);
         courses.push({
-          name: `golfcourse-${course_id}.json`,
+          name: `golf-${course_id}.json`,
           content: JSON.stringify(out),
         });
         $('#status').text("Course retrieved!");
diff --git a/apps/golfview/golfview.js b/apps/golfview/golfview.js
index 62d6f4096..537bd93dd 100644
--- a/apps/golfview/golfview.js
+++ b/apps/golfview/golfview.js
@@ -54,7 +54,9 @@ function distance(a, b) {
 
 
 // golfview.js
-let course = require("Storage").readJSON("golfcourse-Davis.json").holes;//TODO use the course ID
+let courselist = require("Storage").list(/^golf-\d+\.json$/);
+let course = require("Storage").readJSON(courselist[0]).holes; // TODO use the first course for now
+
 let current_hole = 1;
 let hole = course[current_hole.toString()];
 let user_position = {