Rename 'method_def' to 'method_defn' throughout