Fixes in names and utility pages