[FIX] bad tree reorganization and naming convention