Fixed path aliases
Trait name refactoring