ConventionsTrait refactored to (static) Conventions class.
ConventionsTrait reverted and modified to use Conventions class