Changed file names to be more consistant.