Don't use conflicting module names - messes up 'included' blocks, etc
Merge remote-tracking branch 'pdf/conflicting_modules_fix'