Fix registered names