Refactored db column names