better handling of deprecated aliases