File renaming and minor changes