Rename Record to Trap, Code Cleanup
5.0.0-beta-3