fixed file naming scheme and message