 	assay_type VARCHAR(200),
 	PRIMARY KEY (characterization_pk_id),
 	KEY (poc_pk_id),
-	KEY (particle_sample_pk_id),
+	KEY (sample_pk_id),
 	KEY (protocol_file_pk_id)
 ) TYPE=InnoDB
 ;
 
 
-CREATE TABLE nanoparticle_sample_publication
-(
-	particle_sample_pk_id BIGINT NOT NULL,
+CREATE TABLE sample_publication
+(
+	sample_pk_id BIGINT NOT NULL,
 	publication_pk_id BIGINT NOT NULL,
-	PRIMARY KEY (particle_sample_pk_id, publication_pk_id),
+	PRIMARY KEY (sample_pk_id, publication_pk_id),
 	KEY (publication_pk_id),
-	KEY (particle_sample_pk_id)
-) TYPE=InnoDB
-;
-
-
-CREATE TABLE nanoparticle_sample
-(
-	particle_sample_pk_id BIGINT NOT NULL,
-	particle_sample_name VARCHAR(200) NOT NULL,
+	KEY (sample_pk_id)
+) TYPE=InnoDB
+;
+
+
+CREATE TABLE sample
+(
+	sample_pk_id BIGINT NOT NULL,
+	sample_name VARCHAR(200) NOT NULL,
 	created_date DATETIME NOT NULL,
 	created_by VARCHAR(200) NOT NULL,
 	primary_contact_pk_id BIGINT,
-	PRIMARY KEY (particle_sample_pk_id),
-	UNIQUE (particle_sample_name),
-	UNIQUE (particle_sample_pk_id),
+	PRIMARY KEY (sample_pk_id),
+	UNIQUE (sample_name),
+	UNIQUE (sample_pk_id),
 	KEY (primary_contact_pk_id)
 ) TYPE=InnoDB
 ;

;


CREATE TABLE nanoparticle_entity
(
	nanoparticle_entity_pk_id BIGINT NOT NULL,
	composition_pk_id BIGINT NOT NULL,
	discriminator VARCHAR(200),
	description TEXT,
	created_by VARCHAR(200) NOT NULL,
	created_date DATETIME NOT NULL,
	PRIMARY KEY (nanoparticle_entity_pk_id),
	KEY (composition_pk_id)
) TYPE=InnoDB
;

;


CREATE TABLE other_nanomaterial_entity
(
	other_nanomaterial_entity_pk_id BIGINT NOT NULL,
	type VARCHAR(200) NOT NULL,
	PRIMARY KEY (other_nanomaterial_entity_pk_id),
	KEY (other_nanomaterial_entity_pk_id)
) TYPE=InnoDB
;

