modify for CAF module naming