Updated file names and comments