Cleanup

Fix up some names and remove unneeded fields from the targets