Make function names more coherent and move them under dashboard namespace