remove typedef

(cherry picked from commit 7b94a7edc1b5216d239516ab9cebe99afca0f9b6)
incorrect module name

(cherry picked from commit 5618155dee7a5b5ff03dccba2d646b4e8266723f)