Current build

Just name changes and such. A few spelling cleanups and such.