changed some file naming convention