Rebuilding of entity with rename attribute fixed