Fixing the alias names