diff --git a/src/main/less/typography.less b/src/main/less/typography.less
index 5b3e72d57..38f9815b5 100644
--- a/src/main/less/typography.less
+++ b/src/main/less/typography.less
@@ -31,7 +31,7 @@ body, h1, h2, h3, p, input {
 h1 {
   font-size: 24px;
   line-height: 30px;
-  font-family: "Courier New", Courier, monospace;
+  font-family: "montserratregular", sans-serif;
 }
 
 h2 {
@@ -39,7 +39,7 @@ h2 {
   font-weight: 700;
   line-height: 24px;
   margin-bottom: 10px;
-  font-family: "Courier New", Courier, monospace;
+  font-family: "montserratregular", sans-serif;
 }
 
 h3 {
@@ -56,5 +56,5 @@ p {
 
 strong {
   font-weight: 700;
-  font-family: "Courier New", Courier, monospace;
+  font-family: "montserratregular", sans-serif;
 }
diff --git a/src/main/resources/db/hsqldb/schema.sql b/src/main/resources/db/hsqldb/schema.sql
index ae02638a7..625038578 100644
--- a/src/main/resources/db/hsqldb/schema.sql
+++ b/src/main/resources/db/hsqldb/schema.sql
@@ -47,11 +47,11 @@ CREATE TABLE kids (
   id         INTEGER IDENTITY PRIMARY KEY,
   name       VARCHAR(30),
   birth_date DATE,
-  type_id    INTEGER NOT NULL,
+  gender_id    INTEGER NOT NULL,
   parent_id   INTEGER NOT NULL
 );
 ALTER TABLE kids ADD CONSTRAINT fk_kids_parents FOREIGN KEY (parent_id) REFERENCES parents (id);
-ALTER TABLE kids ADD CONSTRAINT fk_kids_gender FOREIGN KEY (type_id) REFERENCES gender (id);
+ALTER TABLE kids ADD CONSTRAINT fk_kids_gender FOREIGN KEY (gender_id) REFERENCES gender (id);
 CREATE INDEX kids_name ON kids (name);
 
 CREATE TABLE visits (
diff --git a/src/main/resources/db/mysql/data.sql b/src/main/resources/db/mysql/data.sql
index 195aeb216..1142e93f3 100644
--- a/src/main/resources/db/mysql/data.sql
+++ b/src/main/resources/db/mysql/data.sql
@@ -1,47 +1,47 @@
-INSERT IGNORE INTO vets VALUES (1, 'James', 'Carter');
-INSERT IGNORE INTO vets VALUES (2, 'Helen', 'Leary');
-INSERT IGNORE INTO vets VALUES (3, 'Linda', 'Douglas');
-INSERT IGNORE INTO vets VALUES (4, 'Rafael', 'Ortega');
-INSERT IGNORE INTO vets VALUES (5, 'Henry', 'Stevens');
-INSERT IGNORE INTO vets VALUES (6, 'Sharon', 'Jenkins');
+INSERT IGNORE INTO doctors VALUES (1, 'James', 'Carter');
+INSERT IGNORE INTO doctors VALUES (2, 'Helen', 'Leary');
+INSERT IGNORE INTO doctors VALUES (3, 'Linda', 'Douglas');
+INSERT IGNORE INTO doctors VALUES (4, 'Rafael', 'Ortega');
+INSERT IGNORE INTO doctors VALUES (5, 'Henry', 'Stevens');
+INSERT IGNORE INTO doctors VALUES (6, 'Sharon', 'Jenkins');
 
 INSERT IGNORE INTO specialties VALUES (1, 'radiology');
 INSERT IGNORE INTO specialties VALUES (2, 'surgery');
 INSERT IGNORE INTO specialties VALUES (3, 'dentistry');
 
-INSERT IGNORE INTO vet_specialties VALUES (2, 1);
-INSERT IGNORE INTO vet_specialties VALUES (3, 2);
-INSERT IGNORE INTO vet_specialties VALUES (3, 3);
-INSERT IGNORE INTO vet_specialties VALUES (4, 2);
-INSERT IGNORE INTO vet_specialties VALUES (5, 1);
+INSERT IGNORE INTO doctor_specialties VALUES (2, 1);
+INSERT IGNORE INTO doctor_specialties VALUES (3, 2);
+INSERT IGNORE INTO doctor_specialties VALUES (3, 3);
+INSERT IGNORE INTO doctor_specialties VALUES (4, 2);
+INSERT IGNORE INTO doctor_specialties VALUES (5, 1);
 
-INSERT IGNORE INTO types VALUES (1, 'male');
-INSERT IGNORE INTO types VALUES (2, 'female');
+INSERT IGNORE INTO gender VALUES (1, 'male');
+INSERT IGNORE INTO gender VALUES (2, 'female');
 
-INSERT IGNORE INTO owners VALUES (1, 'George', 'Franklin', '110 W. Liberty St.', 'Madison', '6085551023');
-INSERT IGNORE INTO owners VALUES (2, 'Betty', 'Davis', '638 Cardinal Ave.', 'Sun Prairie', '6085551749');
-INSERT IGNORE INTO owners VALUES (3, 'Eduardo', 'Rodriquez', '2693 Commerce St.', 'McFarland', '6085558763');
-INSERT IGNORE INTO owners VALUES (4, 'Harold', 'Davis', '563 Friendly St.', 'Windsor', '6085553198');
-INSERT IGNORE INTO owners VALUES (5, 'Peter', 'McTavish', '2387 S. Fair Way', 'Madison', '6085552765');
-INSERT IGNORE INTO owners VALUES (6, 'Jean', 'Coleman', '105 N. Lake St.', 'Monona', '6085552654');
-INSERT IGNORE INTO owners VALUES (7, 'Jeff', 'Black', '1450 Oak Blvd.', 'Monona', '6085555387');
-INSERT IGNORE INTO owners VALUES (8, 'Maria', 'Escobito', '345 Maple St.', 'Madison', '6085557683');
-INSERT IGNORE INTO owners VALUES (9, 'David', 'Schroeder', '2749 Blackhawk Trail', 'Madison', '6085559435');
-INSERT IGNORE INTO owners VALUES (10, 'Carlos', 'Estaban', '2335 Independence La.', 'Waunakee', '6085555487');
+INSERT IGNORE INTO parents VALUES (1, 'George', 'Franklin', '110 W. Liberty St.', 'Madison', '6085551023');
+INSERT IGNORE INTO parents VALUES (2, 'Betty', 'Davis', '638 Cardinal Ave.', 'Sun Prairie', '6085551749');
+INSERT IGNORE INTO parents VALUES (3, 'Eduardo', 'Rodriquez', '2693 Commerce St.', 'McFarland', '6085558763');
+INSERT IGNORE INTO parents VALUES (4, 'Harold', 'Davis', '563 Friendly St.', 'Windsor', '6085553198');
+INSERT IGNORE INTO parents VALUES (5, 'Peter', 'McTavish', '2387 S. Fair Way', 'Madison', '6085552765');
+INSERT IGNORE INTO parents VALUES (6, 'Jean', 'Coleman', '105 N. Lake St.', 'Monona', '6085552654');
+INSERT IGNORE INTO parents VALUES (7, 'Jeff', 'Black', '1450 Oak Blvd.', 'Monona', '6085555387');
+INSERT IGNORE INTO parents VALUES (8, 'Maria', 'Escobito', '345 Maple St.', 'Madison', '6085557683');
+INSERT IGNORE INTO parents VALUES (9, 'David', 'Schroeder', '2749 Blackhawk Trail', 'Madison', '6085559435');
+INSERT IGNORE INTO parents VALUES (10, 'Carlos', 'Estaban', '2335 Independence La.', 'Waunakee', '6085555487');
 
-INSERT IGNORE INTO pets VALUES (1, 'Leo', '2000-09-07', 2, 1);
-INSERT IGNORE INTO pets VALUES (2, 'Basil', '2002-08-06', 1, 2);
-INSERT IGNORE INTO pets VALUES (3, 'Rosy', '2001-04-17', 2, 3);
-INSERT IGNORE INTO pets VALUES (4, 'Jewel', '2000-03-07', 2, 3);
-INSERT IGNORE INTO pets VALUES (5, 'Iggy', '2000-11-30', 1, 4);
-INSERT IGNORE INTO pets VALUES (6, 'George', '2000-01-20', 2, 5);
-INSERT IGNORE INTO pets VALUES (7, 'Samantha', '1995-09-04', 1, 6);
-INSERT IGNORE INTO pets VALUES (8, 'Max', '1995-09-04', 1, 6);
-INSERT IGNORE INTO pets VALUES (9, 'Lucky', '1999-08-06', 1, 7);
-INSERT IGNORE INTO pets VALUES (10, 'Mulligan', '1997-02-24', 2, 8);
-INSERT IGNORE INTO pets VALUES (11, 'Freddy', '2000-03-09', 2, 9);
-INSERT IGNORE INTO pets VALUES (12, 'Lucky', '2000-06-24', 2, 10);
-INSERT IGNORE INTO pets VALUES (13, 'Sly', '2002-06-08', 1, 10);
+INSERT IGNORE INTO kids VALUES (1, 'Leo', '2000-09-07', 2, 1);
+INSERT IGNORE INTO kids VALUES (2, 'Basil', '2002-08-06', 1, 2);
+INSERT IGNORE INTO kids VALUES (3, 'Rosy', '2001-04-17', 2, 3);
+INSERT IGNORE INTO kids VALUES (4, 'Jewel', '2000-03-07', 2, 3);
+INSERT IGNORE INTO kids VALUES (5, 'Iggy', '2000-11-30', 1, 4);
+INSERT IGNORE INTO kids VALUES (6, 'George', '2000-01-20', 2, 5);
+INSERT IGNORE INTO kids VALUES (7, 'Samantha', '1995-09-04', 1, 6);
+INSERT IGNORE INTO kids VALUES (8, 'Max', '1995-09-04', 1, 6);
+INSERT IGNORE INTO kids VALUES (9, 'Lucky', '1999-08-06', 1, 7);
+INSERT IGNORE INTO kids VALUES (10, 'Mulligan', '1997-02-24', 2, 8);
+INSERT IGNORE INTO kids VALUES (11, 'Freddy', '2000-03-09', 2, 9);
+INSERT IGNORE INTO kids VALUES (12, 'Lucky', '2000-06-24', 2, 10);
+INSERT IGNORE INTO kids VALUES (13, 'Sly', '2002-06-08', 1, 10);
 
 INSERT IGNORE INTO visits VALUES (1, 7, '2010-03-04', 'rabies shot');
 INSERT IGNORE INTO visits VALUES (2, 8, '2011-03-04', 'rabies shot');
diff --git a/src/main/resources/db/mysql/schema.sql b/src/main/resources/db/mysql/schema.sql
index 6a9825983..16d2bc153 100644
--- a/src/main/resources/db/mysql/schema.sql
+++ b/src/main/resources/db/mysql/schema.sql
@@ -1,14 +1,14 @@
-CREATE DATABASE IF NOT EXISTS petclinic;
+CREATE DATABASE IF NOT EXISTS kidclinic;
 
-ALTER DATABASE petclinic
+ALTER DATABASE kidclinic
   DEFAULT CHARACTER SET utf8
   DEFAULT COLLATE utf8_general_ci;
 
-GRANT ALL PRIVILEGES ON petclinic.* TO pc@localhost IDENTIFIED BY 'pc';
+GRANT ALL PRIVILEGES ON kidclinic.* TO pc@localhost IDENTIFIED BY 'pc';
 
-USE petclinic;
+USE kidclinic;
 
-CREATE TABLE IF NOT EXISTS vets (
+CREATE TABLE IF NOT EXISTS doctors (
   id INT(4) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
   first_name VARCHAR(30),
   last_name VARCHAR(30),
@@ -21,21 +21,21 @@ CREATE TABLE IF NOT EXISTS specialties (
   INDEX(name)
 ) engine=InnoDB;
 
-CREATE TABLE IF NOT EXISTS vet_specialties (
-  vet_id INT(4) UNSIGNED NOT NULL,
+CREATE TABLE IF NOT EXISTS doctor_specialties (
+  doctor_id INT(4) UNSIGNED NOT NULL,
   specialty_id INT(4) UNSIGNED NOT NULL,
-  FOREIGN KEY (vet_id) REFERENCES vets(id),
+  FOREIGN KEY (doctor_id) REFERENCES doctors(id),
   FOREIGN KEY (specialty_id) REFERENCES specialties(id),
-  UNIQUE (vet_id,specialty_id)
+  UNIQUE (doctor_id,specialty_id)
 ) engine=InnoDB;
 
-CREATE TABLE IF NOT EXISTS types (
+CREATE TABLE IF NOT EXISTS gender (
   id INT(4) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
   name VARCHAR(80),
   INDEX(name)
 ) engine=InnoDB;
 
-CREATE TABLE IF NOT EXISTS owners (
+CREATE TABLE IF NOT EXISTS parents (
   id INT(4) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
   first_name VARCHAR(30),
   last_name VARCHAR(30),
@@ -45,21 +45,21 @@ CREATE TABLE IF NOT EXISTS owners (
   INDEX(last_name)
 ) engine=InnoDB;
 
-CREATE TABLE IF NOT EXISTS pets (
+CREATE TABLE IF NOT EXISTS kids (
   id INT(4) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
   name VARCHAR(30),
   birth_date DATE,
-  type_id INT(4) UNSIGNED NOT NULL,
-  owner_id INT(4) UNSIGNED NOT NULL,
+  gender_id INT(4) UNSIGNED NOT NULL,
+  parent_id INT(4) UNSIGNED NOT NULL,
   INDEX(name),
-  FOREIGN KEY (owner_id) REFERENCES owners(id),
-  FOREIGN KEY (type_id) REFERENCES types(id)
+  FOREIGN KEY (parent_id) REFERENCES parents(id),
+  FOREIGN KEY (gender_id) REFERENCES gender(id)
 ) engine=InnoDB;
 
 CREATE TABLE IF NOT EXISTS visits (
   id INT(4) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
-  pet_id INT(4) UNSIGNED NOT NULL,
+  kid_id INT(4) UNSIGNED NOT NULL,
   visit_date DATE,
   description VARCHAR(255),
-  FOREIGN KEY (pet_id) REFERENCES pets(id)
+  FOREIGN KEY (kid_id) REFERENCES kids(id)
 ) engine=InnoDB;