add "Trait" name suffix

* add support for ExpiringLockInterface