Merge "Fix stack names"