Merge "Revert "Make sure that names of all entries have the same encoding.""