Some files renamed for consistency.