Rename formatters to serializers
Other updates