Fix the names of attributes