changed some names and fixed some files