Changes to allow support for name aliases