Fix file extensions & clean up wording