Put together two different fixes

Miles Francerequested to merge
1.0.x into 3436547-coding-standards-fixes
  • Renamed block file
  • Phpcs fixes
  • Tweaked to make block work

Merge request reports