Changed naming scheme

Changed the way I was naming files as it was completely unnecessary (I
blame tiredness).