Refactored too long names in cells