Properly name the ids