Added quoted in name alias detection and slotting