Fixed duplicate aliases