Renaming, cleaning up, readding CollisionShape, AAB, Poly