More tweaks following the renamed file names