[Generator] [Behavior] reverted changes on Behavior classes