Updates for better name fixing.