Rename + cleanup gallery code