Cleaned up DB Names.