Rename 3 packages as described on kicad-footprints#2605

Fixes: kicad-footprints#2605 (closed)

Also move definition to inline with fp ordering

fp MR: kicad-footprints!3168 (merged)

3D packages MR: kicad-packages3D!896 (merged)