Don't use conflicting module names - messes up 'included' blocks, etc
Merge pull request #1 from pdf/conflicting_modules_fix

Don't use conflicting module names - messes up 'included' blocks, etc