Refactoring/alias to aliases, closes #119