Renamed scaffolding for conflicts