changed some file names for consistency