fix duplicated ids, using classes instead

Signed-off-by: Henrique Vicente <henriquevicente@gmail.com>