Adjusted tables to use canonical class name instead of simple