Doing some renaming and scoping out basic db schema.