Renaming to fix case-sensitive issues