Fixed addition of .type suffix (not needed for classes)