name changes (see ECLIPSE-851)