Renamed "trait" to "characteristic"

In order to address #3