update to use new class/id convention