Renaming dirs and apps for consistency