refactor database name

changes database name and adds javadoc comments.