* Remove filename WPCS exception * Rename files to match WPCS * Fix incorrect file name update in an unit test * Rename new file