Unify VZW & SPR

Signed-off-by: EvolutionMod <kernelcraft@gmail.com>