Updated file naming to follow convention