Updated filenames

updated filenames, set some public to private