renaming and thetao conversion fix