Fixes to the Creator object to enable better name correction