Cannot reserve two spaces with same email. Some minor renames