refactored after updating schema

method and field naming consistent with db attributes


Signed-off-by: celynch <celynch@gmail.com>