renamed some more things and deleted improperly named items