Changed file names to be conform to consistent policy
Changed filename to represent consistent policy