Match hardware rename; andy alias now works everywhere.