Fixed Names
fixed filenames and cleaned up