Renames directories to be consistent with other system tools