refactor names of field pieces