lldb: Rename new types to the old names