Added support for alias names with dashes