changed some file naming conventions