Updated file naming conventions