Changed class names due to comment by Shannon.

Added a bit more clarification to the comments in the database class.