Fix names being funny