some file renaming for consistency and minor changes.