Rename some things.
Consistent quotes everywhere.