Rename handlers.
Split upsert into create and update. Change JSON format of entry.