Rework alias replacing

Redo the regular expression to capture the leading and trailing characters and use them in the replacement to expand the places where the replacement happens

Strip the leading "::" from all values in the alias_data dictionary.