Update names to use underscores