diff --git a/fiori/app/index.cds b/fiori/app/-index.cds
similarity index 100%
rename from fiori/app/index.cds
rename to fiori/app/-index.cds
diff --git a/fiori/app/admin/fiori-service.cds b/fiori/app/admin/fiori-service.cds
index 83ff758a..8e97fdbe 100644
--- a/fiori/app/admin/fiori-service.cds
+++ b/fiori/app/admin/fiori-service.cds
@@ -1,4 +1,4 @@
-using { AdminService } from '../../db';
+using { AdminService } from '../../db/schema';
 
 ////////////////////////////////////////////////////////////////////////////
 //
diff --git a/fiori/db/hana/index.cds b/fiori/db/hana/index.cds
index db46e6d5..04822ad0 100644
--- a/fiori/db/hana/index.cds
+++ b/fiori/db/hana/index.cds
@@ -2,7 +2,7 @@
 //  Add Author.age and .lifetime with a DB-specific function
 //
 
-using { AdminService } from '..';
+using { AdminService } from '../schema';
 
 extend projection AdminService.Authors with {
   YEARS_BETWEEN(dateOfBirth, dateOfDeath)         as age: Integer,
diff --git a/fiori/db/index.cds b/fiori/db/schema.cds
similarity index 100%
rename from fiori/db/index.cds
rename to fiori/db/schema.cds
diff --git a/fiori/db/sqlite/index.cds b/fiori/db/sqlite/index.cds
index 9f2cc3b5..019335ef 100644
--- a/fiori/db/sqlite/index.cds
+++ b/fiori/db/sqlite/index.cds
@@ -2,7 +2,7 @@
 //  Add Author.age and .lifetime with a DB-specific function
 //
 
-using { AdminService } from '..';
+using { AdminService } from '../schema';
 
 extend projection AdminService.Authors with {
   strftime('%Y',dateOfDeath)-strftime('%Y',dateOfBirth)              as age: Integer,