DB tables renamed

Change-Id: Ie6436afe69218a12a1b526c27b7aa184f8af16e0