- Added the userptr for the sys file scan
- File rename for consistency