Fixes more underscores