Fixes for Tax name changes.