Added escapes for alias names