Rename and remove some parenthesis