diff --git a/src/main/riddl/AllIdsProjections/allIdsProjections.riddl b/src/main/riddl/AllIdsProjections/allIdsProjections.riddl
index 0b70fd7d..d8d67e91 100644
--- a/src/main/riddl/AllIdsProjections/allIdsProjections.riddl
+++ b/src/main/riddl/AllIdsProjections/allIdsProjections.riddl
@@ -107,7 +107,7 @@ context AllIdsProjections is  {
 
   projector AllStoreIdsView is {
      record AllStoreIdsFields {
-        store: StoreId
+        store: ImprovingApp.StoreContext.StoreId
     }
     handler AllStoreIdsViewHandler is {
         on event StoreCreated {
diff --git a/src/main/riddl/MembersAttendingEventsForAnOrganizationProjection/membersAttendingEventsForAnOrganizationProjection.riddl b/src/main/riddl/MembersAttendingEventsForAnOrganizationProjection/membersAttendingEventsForAnOrganizationProjection.riddl
index c7c5e70f..52bb72b6 100644
--- a/src/main/riddl/MembersAttendingEventsForAnOrganizationProjection/membersAttendingEventsForAnOrganizationProjection.riddl
+++ b/src/main/riddl/MembersAttendingEventsForAnOrganizationProjection/membersAttendingEventsForAnOrganizationProjection.riddl
@@ -1,6 +1,6 @@
 query FindMembersAtEventsOnDayForOrg is {org: OrganizationId, eventDate: Date}
 result NoEventsOnDayForOrg is {org: OrganizationId}
-result MembersAtEventsOnDay is {memberEvents: MemberEvents+}
+result MembersAtEventsOnDay is {memberEvents: ImprovingApp.MemberEvents+}
 
 context MembersAttendingEventsForAnOrganizationProjection is  {
   projector MembersAttendingEventsForAnOrganizationView is {
diff --git a/src/main/riddl/OrganizationsForMembersAttendingEventsProjection/organizationsForMembersAttendingEventsProjection.riddl b/src/main/riddl/OrganizationsForMembersAttendingEventsProjection/organizationsForMembersAttendingEventsProjection.riddl
index 3bc5e5df..d16a7764 100644
--- a/src/main/riddl/OrganizationsForMembersAttendingEventsProjection/organizationsForMembersAttendingEventsProjection.riddl
+++ b/src/main/riddl/OrganizationsForMembersAttendingEventsProjection/organizationsForMembersAttendingEventsProjection.riddl
@@ -16,7 +16,7 @@ context OrganizationsForMembersAttendingEventsProjections is  {
         attendingMemberName: String //member table
     }
     handler OrganizationsForMembersAttendingEventsViewHandler is {
-        on event OrganizationEstablished {
+        on event ImprovingApp.OrganizationContext.OrganizationEstablished {
           "create row in org table with orgId set to OrganizationEstablished.info.orgId"
           "set row's attendingMemberOrgName to OrganizationEstablished.info.name"
         }