Improved name alias handling