changed prefix trait name used classes and files
Merge branch 'feature_20140321' into develop