Rename types ending in _t, put brackets on same line