change naming for some main program files for consistency