Allow 'trait' to appear in package names and fully qualified class names in general

Allow 'trait' to appear in package names and fully qualified class names in general