[Models, DB] rename models to singular, add month data