svg: static fields reordering and renaming
svg: minor renaming