Merge "Fix alias capitalization warning"