Refactored alternate names to use aliases