Corrected some name cases and rebuilt