Remove useless deprecated_ module
Fix names to match enum declarations