more accurate final names
removed unused protocol and corrected file nams