diff --git a/src/cryogen_core/classpath_able_io.clj b/src/cryogen_core/classpath_able_io.clj
index 29d7c35..643767a 100644
--- a/src/cryogen_core/classpath_able_io.clj
+++ b/src/cryogen_core/classpath_able_io.clj
@@ -29,10 +29,10 @@
 
 (def Resource
   {:virtual-path  VirtualPath
-   :uri           JavaUri
-   :java-path     JavaPath
    :source-type   SourceType
-   :resource-type ResourceType})
+   :resource-type ResourceType
+   :java-uri      JavaUri
+   :java-path     JavaPath})
 
 ; ----------------------- Domain functions ------------------------
 (def no-link-option (into-array [LinkOption/NOFOLLOW_LINKS]))
@@ -44,7 +44,7 @@
     source-type :- SourceType
     resource-type :- ResourceType]
    {:virtual-path    virtual-path
-    :uri           uri
+    :java-uri            uri
     :java-path     java-path
     :source-type   source-type
     :resource-type resource-type})
@@ -52,7 +52,7 @@
     java-path :- JavaPath
     source-type :- SourceType]
    {:virtual-path    virtual-path
-    :uri           (.toUri java-path)
+    :java-uri            (.toUri java-path)
     :java-path     java-path
     :source-type   source-type
     :resource-type (cond
diff --git a/src/cryogen_core/compiler.clj b/src/cryogen_core/compiler.clj
index 164be8f..973dd4a 100644
--- a/src/cryogen_core/compiler.clj
+++ b/src/cryogen_core/compiler.clj
@@ -545,7 +545,7 @@
         file-resource-prefix "resources/"
         file-target-prefix "target/"
         resource-prefix (str "templates/themes/" theme)
-        resource-file-uri (:uri
+        resource-file-uri (:java-uri
                            (cp-io/resource-from-cp-or-fs
                             file-resource-prefix resource-prefix ""
                             :from-cp false))