Content Types but no fields

Ok I have upgraded from the latest stable 5.x to 6 and firstly the stable 6.2 rc6 cck. The thing was firstly I had a problem with the cck upgrade sql (it was missing off the content_ prefix) which I fixed in the end on the command line (I was getting lots of

user warning: Unknown column 'widget_module' in 'field list' query: UPDATE node_field_instance SET widget_module = 'text', widget_type = 'text_textarea' WHERE field_name = 'field_publisher' AND type_name = 'content_ot_assesments' 

I just did a manual sql query of UPDATE content_node_field_instance SET widget_module = 'text', widget_type = 'text_textarea' WHERE field_name = 'field_publisher' AND type_name = 'content_ot_assesments' and no more problems on upgrade..)

However I still couldn't see my old content types - I could see the titles - but no fields. I wondered if I needed to upgrade to dev version - which I duly did - but still no luck..

Has CCK changed the table names to not content_ ? Should I just rename my tables?