Improves names of things

Crappy names left over from just hacking
things together have been fixed. UUID names
of things have been normalized too.