Rename internal types