Replace prefix matching with aliases
adding support for prefix matching against aliases & names