Rename files. Minor fixes.