Refactoring to rename dbase fields and extract method

Change-Id: I1db838500ce77140870251c98074fddcd811a20d