Name changes and datatype move