Updated file naming convention