No, lets stick with the old Types and Tables names.