Fix wrong record names to be suitable