First stab at refactoring to use aliases. This doesn't quite work right
yet.
Refactored alternate names to use aliases