Back to flat sink names, but with override possibility.