Updated for new trait filename scheme