MADS: Implement scene 318, some renaming