NXP-9739: Follow changes and rename old images