update from master
Use snake_case on filename
Do minor cleanup

* Beautify description
* Use double quotes for interpolation
Do minor fixupts

* Delete peer method
* Make verifications more strict
Use #empty?
Really land the #4130 module