make files naming consistent