refactor: Update code in /includes to be psr2 compliant #4220
Renamed each module to a more appropriate name.