Bugfixing: adding alias names