Remove double-underscores from names