Add boundaries to underscores