rename ids to better identify them