Updated for proper database naming