Use class name instead of hard coded trait name (#40)