diff --git a/src/ppm_comp_pp_cell.f b/src/ppm_comp_pp_cell.f
index ea76896b127e4530f881784a2f456c0ee11da9f2..69d6a500417a297ca779a08302458d3e75291631 100644
--- a/src/ppm_comp_pp_cell.f
+++ b/src/ppm_comp_pp_cell.f
@@ -77,12 +77,12 @@
       !  Modules
       !-------------------------------------------------------------------------
       USE ppm_module_data
-      USE ppm_module_check_topoid
+      USE ppm_module_check_id
       USE ppm_module_data_neighlist
       USE ppm_module_substart
       USE ppm_module_substop
       USE ppm_module_error
-      USE ppm_module_neighlist_MkNeighIdx
+      USE ppm_module_neighlist
       IMPLICIT NONE
 #if   __KIND == __SINGLE_PRECISION | __KIND == __SINGLE_PRECISION_COMPLEX
       INTEGER, PARAMETER :: MK = ppm_kind_single
diff --git a/src/ppm_fdsolver_map_2d.f b/src/ppm_fdsolver_map_2d.f
index 7634052adb2a7d46076faac4589696c8f7634972..b78fe855171b05298fdc9f1ba7bb4a485142c469 100644
--- a/src/ppm_fdsolver_map_2d.f
+++ b/src/ppm_fdsolver_map_2d.f
@@ -84,8 +84,7 @@
       !-------------------------------------------------------------------------
       USE ppm_module_data
       USE ppm_module_map
-      USE ppm_module_check_topoid
-      USE ppm_module_check_meshid
+      USE ppm_module_check_id
       USE ppm_module_error
       IMPLICIT NONE
 #if   __KIND == __SINGLE_PRECISION | __KIND == __COMPLEX 
diff --git a/src/ppm_fdsolver_map_3d.f b/src/ppm_fdsolver_map_3d.f
index 593d7fdf37d94a16e2adbc90dca41bd2817e2f4c..d2f7995d8d76e6509a84d237f2ba255862d302f9 100644
--- a/src/ppm_fdsolver_map_3d.f
+++ b/src/ppm_fdsolver_map_3d.f
@@ -95,8 +95,7 @@
       !-------------------------------------------------------------------------
       USE ppm_module_data
       USE ppm_module_map
-      USE ppm_module_check_topoid
-      USE ppm_module_check_meshid
+      USE ppm_module_check_id
       USE ppm_module_error
 
 
diff --git a/src/ppm_ode_step.f b/src/ppm_ode_step.f
index ae93ebb89ec2a9c9b1a82981234fcd7b1e85a135..4d360da908b9735a41132bf120b00b1d07ef8226 100644
--- a/src/ppm_ode_step.f
+++ b/src/ppm_ode_step.f
@@ -133,7 +133,7 @@
         !-----------------------------------------------------------------------
         USE ppm_module_data_ode
         USE ppm_module_data
-        USE ppm_module_check_topoid
+        USE ppm_module_check_id
         USE ppm_module_substart
         USE ppm_module_substop
         USE ppm_module_error