close #16 - rename behaviors