changed some more file and directory names.