Remove useless deprecated_ module
Fix names to match enum declarations
Merge pull request #3 from qznc/master

Two minor fixes to make pdf output work