PSR-2 fixes, typos in filenames, doc updates