calculated data controller + naming fixes in dao