Clean up and rename most monster functions (mostly untested, but no issues found)