Fix underscores