Clean up baseUtil naming and docs