refactored file names to generic file names