[SQUASH ME] address @LudwigOrtmann's comments

%s/project/application/g
%s/folder/directory/g