restored class and id full names