filenames changes, tweaks & fixes