The physics-based BTI Analysis Tool (BAT) is used to model the time kinetics of threshold voltage shift (VT) during and after NBTI in p-channel planar bulk and FDSOI MOSFETs and SOI FinFETs. BAT uses uncorrelated contributions from the trap generation at the channel/gate insulator interface (VIT) and gate insulator bulk (VOT), and hole trapping in pre-existing gate insulator bulk traps (VHT). The VIT kinetics is simulated by the Reaction-Diffusion (RD) model. The empirical VHT model used earlier is now substituted by the Activated Barrier Double Well Thermionic (ABDWT) model. The ABDWT model is also used to verify the time constant of the electron capture induced fast VIT recovery. Empirical equations are used for VOT. The enhanced BAT modeling framework is validated using measured data from a wide range of experimental conditions and across different device architectures and gate insulator processes.