Rewrite to avoid capitalization issues