resolved file naming issues with full paths