diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IForcedIdDao.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IForcedIdDao.java
index ed2425085bf..3042da6b639 100644
--- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IForcedIdDao.java
+++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/IForcedIdDao.java
@@ -33,7 +33,7 @@ import org.springframework.stereotype.Repository;
  * No runtime code should query this table except for deletions by PK.
  * To be deleted in 2024 (zero-downtime).
  */
-@Deprecated(since = "6.7")
+@Deprecated(since = "6.10")
 @Repository
 public interface IForcedIdDao extends JpaRepository<ForcedId, Long>, IHapiFhirJpaRepository {
 
diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/custom/IResourceTableDaoImpl.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/custom/IResourceTableDaoImpl.java
index 86e9977e890..a8d86d69e43 100644
--- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/custom/IResourceTableDaoImpl.java
+++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/custom/IResourceTableDaoImpl.java
@@ -54,7 +54,7 @@ public class IResourceTableDaoImpl implements IForcedIdQueries {
 	 */
 	public Collection<Object[]> findAndResolveByForcedIdWithNoType(
 			String theResourceType, Collection<String> theForcedIds, boolean theExcludeDeleted) {
-		String query = "SELECT t.myResourceType, t.id, t.myFhirId, t.myDeleted "
+		String query = "SELECT t.myResourceType, t.myId, t.myFhirId, t.myDeleted "
 				+ "FROM ResourceTable t "
 				+ "WHERE t.myResourceType = :resource_type AND t.myFhirId IN ( :forced_id )";
 
@@ -79,7 +79,7 @@ public class IResourceTableDaoImpl implements IForcedIdQueries {
 			Collection<String> theForcedIds,
 			Collection<Integer> thePartitionId,
 			boolean theExcludeDeleted) {
-		String query = "SELECT t.myResourceType, t.id, t.myFhirId, t.myDeleted "
+		String query = "SELECT t.myResourceType, t.myId, t.myFhirId, t.myDeleted "
 				+ "FROM ResourceTable t "
 				+ "WHERE t.myResourceType = :resource_type AND t.myFhirId IN ( :forced_id ) AND t.myPartitionIdValue IN ( :partition_id )";
 
@@ -102,7 +102,7 @@ public class IResourceTableDaoImpl implements IForcedIdQueries {
 	 */
 	public Collection<Object[]> findAndResolveByForcedIdWithNoTypeInPartitionNull(
 			String theResourceType, Collection<String> theForcedIds, boolean theExcludeDeleted) {
-		String query = "SELECT t.myResourceType, t.id, t.myFhirId, t.myDeleted "
+		String query = "SELECT t.myResourceType, t.myId, t.myFhirId, t.myDeleted "
 				+ "FROM ResourceTable t "
 				+ "WHERE t.myResourceType = :resource_type AND t.myFhirId IN ( :forced_id ) AND t.myPartitionIdValue IS NULL";
 
@@ -127,7 +127,7 @@ public class IResourceTableDaoImpl implements IForcedIdQueries {
 			Collection<String> theForcedIds,
 			List<Integer> thePartitionIdsWithoutDefault,
 			boolean theExcludeDeleted) {
-		String query = "SELECT t.myResourceType, t.id, t.myFhirId, t.myDeleted "
+		String query = "SELECT t.myResourceType, t.myId, t.myFhirId, t.myDeleted "
 				+ "FROM ResourceTable t "
 				+ "WHERE t.myResourceType = :resource_type AND t.myFhirId IN ( :forced_id ) AND (t.myPartitionIdValue IS NULL OR t.myPartitionIdValue IN ( :partition_id ))";