Refactored symbol filling
Name change, part 1
Name change, part 2
Name change, part 3
Name change, part 4